From 99fe6c98c3c21874ff781583ee9ad398a303079d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 13 Jan 2011 14:20:52 -0500 Subject: [PATCH] start to use git repos --- coblitz-latest-tags.mk | 26 ++++++++++++------------- coblitz-unstable-tags.mk | 2 +- coblitz.mk | 41 +++++++++++++++++++++++++++------------- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk index e4ee0a5a..820b4498 100644 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@ -8,12 +8,12 @@ util-vserver-BRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27 -NodeUpdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7 +nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-GITPATH := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29 pyplnet-GITPATH := git://git.planet-lab.org/pyplnet@pyplnet-4.3-7 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 -CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 +codemux-GITPATH := git://git.planet-lab.org/codemux.git@CoDemux-0.1-13 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1 pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 @@ -24,20 +24,20 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-GITPATH := git://git.planet-lab.org/plcapi@plcapi-4.3-36 +plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-4.3-36 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 -PLEWWW-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-53 +plewww-GITPATH := git://git.planet-lab.org/plewww@PLEWWW-4.3-53 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/ pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/ -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7 -BootManager-BRANCH := 4.3 -BootManager-GITPATH := git://git.planet-lab.org/bootmanager@bootmanager-4.3-19 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 -VserverReference-GITPATH := git://git.planet-lab.org/vserver-reference@vserver-reference-4.2-18 -BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11 -MyPLC-GITPATH := git://git.planet-lab.org/myplc@myplc-4.3-41 +nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-7 +bootmanager-BRANCH := 4.3 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager@bootmanager-4.3-20 +pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9 +bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-4.2-18 +vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference@vserver-reference-4.2-18 +bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-1.0-12 +myplc-GITPATH := git://git.planet-lab.org/myplc@myplc-4.3-43 sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 diff --git a/coblitz-unstable-tags.mk b/coblitz-unstable-tags.mk index 02981179..46ac7b82 100644 --- a/coblitz-unstable-tags.mk +++ b/coblitz-unstable-tags.mk @@ -33,7 +33,7 @@ www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/ pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/ nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-7 -BootManager-BRANCH := 4.3 +bootmanager-BRANCH := 4.3 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager@bootmanager-4.3-20 pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-4.2-18 diff --git a/coblitz.mk b/coblitz.mk index 73ccadee..5dc69a23 100644 --- a/coblitz.mk +++ b/coblitz.mk @@ -12,6 +12,21 @@ # see doc in Makefile # +# mkinitrd +# +ifeq "$(PLDISTROTAGS)" "coblitz-unstable-tags.mk" +ifeq "$(DISTRONAME)" "centos5" +mkinitrd-MODULES := mkinitrd +mkinitrd-SPEC := mkinitrd.spec +mkinitrd-BUILD-FROM-SRPM := yes +ALL += mkinitrd +IN_BOOTCD += mkinitrd +IN_VSERVER += mkinitrd +IN_BOOTSTRAPFS += mkinitrd +IN_MYPLC += mkinitrd +endif +endif + # # kernel # @@ -97,7 +112,7 @@ IN_BOOTSTRAPFS += util-vserver-pl # # NodeUpdate # -nodeupdate-MODULES := NodeUpdate +nodeupdate-MODULES := nodeupdate nodeupdate-SPEC := NodeUpdate.spec ALL += nodeupdate IN_BOOTSTRAPFS += nodeupdate @@ -113,7 +128,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := NodeManager +nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -129,7 +144,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 @@ -216,7 +231,7 @@ ALL += vsys-scripts # # PLCAPI # -PLCAPI-MODULES := PLCAPI +PLCAPI-MODULES := plcapi PLCAPI-SPEC := PLCAPI.spec ALL += PLCAPI IN_MYPLC += PLCAPI @@ -233,7 +248,7 @@ IN_MYPLC += drupal # # use the plewww module instead # -plewww-MODULES := PLEWWW +plewww-MODULES := plewww plewww-SPEC := plewww.spec #ALL += plewww #IN_MYPLC += plewww @@ -303,7 +318,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := BootManager +bootmanager-MODULES := bootmanager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -329,7 +344,7 @@ IN_BOOTCD += pyplnet # # bootcd # -bootcd-MODULES := BootCD build +bootcd-MODULES := bootcd build bootcd-SPEC := bootcd.spec bootcd-RPMBUILD := sudo bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) @@ -341,7 +356,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 @@ -352,7 +367,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) @@ -370,7 +385,7 @@ NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).r 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 @@ -385,7 +400,7 @@ IN_MYPLC += noderepo # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # -myplc-MODULES := MyPLC build +myplc-MODULES := myplc build myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc @@ -393,12 +408,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 -- 2.47.0