X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=b8bad61ce1d2505d66ce1f9aeea1eb9a70896265;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=95112810ef1b74dad2b5ae2ef332c458128cef07;hpb=103aad3ed093ace885ba1a682e292d85c7bc48f8;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 95112810..b8bad61c 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -56,9 +56,6 @@ IN_BOOTSTRAPFS += madwifi # util-vserver-MODULES := util-vserver util-vserver-SPEC := util-vserver.spec -ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk" -util-vserver-BUILD-FROM-SRPM := yes -endif util-vserver-RPMFLAGS:= --without dietlibc ALL += util-vserver IN_BOOTSTRAPFS += util-vserver @@ -172,9 +169,6 @@ IN_BOOTSTRAPFS += mom # iptables-MODULES := iptables iptables-SPEC := iptables.spec -ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk" -iptables-BUILD-FROM-SRPM := yes -endif iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers ALL += iptables IN_BOOTSTRAPFS += iptables @@ -184,9 +178,6 @@ IN_BOOTSTRAPFS += iptables # iproute-MODULES := iproute2 iproute-SPEC := iproute.spec -ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk" -iproute-BUILD-FROM-SRPM := yes -endif ALL += iproute IN_BOOTSTRAPFS += iproute IN_VSERVER += iproute @@ -231,10 +222,10 @@ ALL += vsys-scripts # # PLCAPI # -PLCAPI-MODULES := PLCAPI -PLCAPI-SPEC := PLCAPI.spec -ALL += PLCAPI -IN_MYPLC += PLCAPI +plcapi-MODULES := plcapi +plcapi-SPEC := PLCAPI.spec +ALL += plcapi +IN_MYPLC += plcapi # # drupal @@ -248,7 +239,7 @@ IN_MYPLC += drupal # # use the plewww module instead # -plewww-MODULES := PLEWWW +plewww-MODULES := plewww plewww-SPEC := plewww.spec ALL += plewww IN_MYPLC += plewww @@ -444,7 +435,7 @@ ALL += myplc # myplc-docs only contains docs for PLCAPI and NMAPI, but # we still need to pull MyPLC, as it is where the specfile lies, # together with the utility script docbook2drupal.sh -myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor +myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor myplc-docs-SPEC := myplc-docs.spec ALL += myplc-docs