X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=fb9839634bf0330e5642e685cf2cd50e698a80a1;hb=c634de4062cb0ba627fd799e7a8084839239fc4d;hp=77333b0945be6245eef2331fb75e0521e5d1ba93;hpb=00d7ecd34c8caca8e1ef4ea5635d0dcf462da520;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 77333b09..fb983963 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -111,7 +111,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := NodeManager +nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -127,7 +127,7 @@ IN_BOOTSTRAPFS += sshd # # codemux: Port 80 demux # -codemux-MODULES := CoDemux +codemux-MODULES := codemux codemux-SPEC := codemux.spec codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux @@ -222,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 @@ -239,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 @@ -328,7 +328,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := BootManager +bootmanager-MODULES := bootmanager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -371,7 +371,7 @@ ALL += omf-expctl # # bootcd # -bootcd-MODULES := BootCD build +bootcd-MODULES := bootcd build bootcd-SPEC := bootcd.spec bootcd-RPMBUILD := sudo bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) @@ -383,7 +383,7 @@ IN_MYPLC += bootcd # # vserver : reference image for slices # -vserver-MODULES := VserverReference build +vserver-MODULES := vserver-reference build vserver-SPEC := vserver-reference.spec vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml @@ -394,7 +394,7 @@ IN_BOOTSTRAPFS += vserver # # bootstrapfs # -bootstrapfs-MODULES := BootstrapFS build +bootstrapfs-MODULES := bootstrapfs build bootstrapfs-SPEC := bootstrapfs.spec bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) @@ -412,7 +412,7 @@ NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) SPACE=$(subst x, ,x) NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) -noderepo-MODULES := BootstrapFS +noderepo-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec noderepo-RPMBUILD := sudo bash ./rpmbuild.sh # package requires all regular packages @@ -427,7 +427,7 @@ IN_MYPLC += noderepo # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # -myplc-MODULES := MyPLC +myplc-MODULES := myplc myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc @@ -435,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