X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=f11f49f50341fd059faa442aa3f071836ad463ec;hb=6cfa4066f86629ea89c86826f998f18d0e0a095d;hp=edac14f4dcc450bbae9c924079ac212e33cf0168;hpb=61908f1c343871575276cc196ce9cab0b2ffedde;p=build.git diff --git a/onelab.mk b/onelab.mk index edac14f4..f11f49f5 100644 --- a/onelab.mk +++ b/onelab.mk @@ -191,7 +191,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := NodeManager +nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -207,7 +207,7 @@ IN_BOOTSTRAPFS += sshd # # codemux: Port 80 demux # -codemux-MODULES := CoDemux +codemux-MODULES := codemux codemux-SPEC := codemux.spec #codemux-RPMBUILD := bash ./rpmbuild.sh ALL += codemux @@ -394,7 +394,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := BootManager +bootmanager-MODULES := bootmanager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -435,7 +435,7 @@ ALL += omf-expctl # # bootcd # -bootcd-MODULES := BootCD build +bootcd-MODULES := bootcd build bootcd-SPEC := bootcd.spec bootcd-RPMBUILD := bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) @@ -447,7 +447,7 @@ IN_MYPLC += bootcd # # vserver : reference image for slices # -vserver-MODULES := VserverReference build +vserver-MODULES := vserverreference build vserver-SPEC := vserver-reference.spec vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml @@ -458,7 +458,7 @@ IN_BOOTSTRAPFS += vserver # # bootstrapfs # -bootstrapfs-MODULES := BootstrapFS build +bootstrapfs-MODULES := bootstrapfs build bootstrapfs-SPEC := bootstrapfs.spec bootstrapfs-RPMBUILD := bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) @@ -476,7 +476,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 := bash ./rpmbuild.sh # package requires all embedded packages @@ -497,7 +497,7 @@ SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms)) SPACE=$(subst x, ,x) SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS)) -slicerepo-MODULES := BootstrapFS +slicerepo-MODULES := bootstrapfs slicerepo-SPEC := slicerepo.spec slicerepo-RPMBUILD := bash ./rpmbuild.sh # package requires all embedded packages @@ -511,7 +511,7 @@ ALL += slicerepo # # 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 @@ -519,12 +519,12 @@ 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 # using some other name than myplc-release, as this is a make target already -release-MODULES := MyPLC +release-MODULES := myplc release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release