From 6ed314db2b3de86c2472a38cfd54f3d0641e5ece Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 7 Jul 2010 22:36:02 +0200 Subject: [PATCH] module name changes --- onelab.mk | 16 ++++++++-------- planetlab.mk | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/onelab.mk b/onelab.mk index edac14f4..73d4efcb 100644 --- a/onelab.mk +++ b/onelab.mk @@ -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,7 +519,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 diff --git a/planetlab.mk b/planetlab.mk index b8bad61c..9d9b4651 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 @@ -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 := vserverreference 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 @@ -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 -- 2.43.0