From f8f51ab867f54aa843abfebd33d1d2183f427d83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 11 Jan 2011 17:29:00 -0500 Subject: [PATCH] revert back --- coblitz-latest-tags.mk | 42 +++++++++++++++++++++--------------------- coblitz.mk | 42 +++++++++++++----------------------------- 2 files changed, 34 insertions(+), 50 deletions(-) diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk index e26f310a..a86d6e40 100644 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@ -1,43 +1,43 @@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication -linux-2.6-BRANCH := coblitz2 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-22-49.3.coblitz +linux-2.6-BRANCH := coblitz2 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-22-49.3.coblitz madwifi-BRANCH := 0.9.4 -madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-0.9.4-3 -util-vserver-BRANCH := scholz -util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27 +madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3 +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 -nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7 +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 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-GITPATH := git://git.planet-lab.org/codemux.git@CoDemux-0.1-13 +CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/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 -iptables-BRANCH := 1.3.8 -iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12 -iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 +iptables-BRANCH := 1.3.8 +iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12 +iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 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.planet-lab.org/plewww@PLEWWW-4.3-53 +PLEWWW-GITPATH := git://git.onelab.eu/plewww.git@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-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-7 +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-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-5.0-5 -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 +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-5.0-5 +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 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.mk b/coblitz.mk index 70c7440f..73ccadee 100644 --- a/coblitz.mk +++ b/coblitz.mk @@ -12,19 +12,6 @@ # see doc in Makefile # -# mkinitrd -# -#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 - # # kernel # @@ -34,9 +21,6 @@ kernel-MODULES := linux-2.6 kernel-SPEC := kernel-2.6.spec -#ifeq "$(DISTRONAME)" "centos5" -#kernel-DEPEND-DEVEL-RPMS: mkinitrd -#endif kernel-BUILD-FROM-SRPM := yes ifeq "$(HOSTARCH)" "i386" kernel-RPMFLAGS:= --target i686 @@ -113,7 +97,7 @@ IN_BOOTSTRAPFS += util-vserver-pl # # NodeUpdate # -nodeupdate-MODULES := nodeupdate +nodeupdate-MODULES := NodeUpdate nodeupdate-SPEC := NodeUpdate.spec ALL += nodeupdate IN_BOOTSTRAPFS += nodeupdate @@ -129,7 +113,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := nodemanager +nodemanager-MODULES := NodeManager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -145,7 +129,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 @@ -232,7 +216,7 @@ ALL += vsys-scripts # # PLCAPI # -PLCAPI-MODULES := plcapi +PLCAPI-MODULES := PLCAPI PLCAPI-SPEC := PLCAPI.spec ALL += PLCAPI IN_MYPLC += PLCAPI @@ -249,7 +233,7 @@ IN_MYPLC += drupal # # use the plewww module instead # -plewww-MODULES := plewww +plewww-MODULES := PLEWWW plewww-SPEC := plewww.spec #ALL += plewww #IN_MYPLC += plewww @@ -319,7 +303,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := bootmanager +bootmanager-MODULES := BootManager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -345,7 +329,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) @@ -357,7 +341,7 @@ IN_MYPLC += bootcd # # vserver : reference image for slices # -vserver-MODULES := vserver-reference build +vserver-MODULES := VserverReference build vserver-SPEC := vserver-reference.spec vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml @@ -368,7 +352,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) @@ -386,7 +370,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 @@ -401,7 +385,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 @@ -409,12 +393,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