From: Thierry Parmentelat Date: Sat, 30 Jan 2010 14:10:00 +0000 (+0000) Subject: this is now the 5.0 build - adopting the new branches in the non-k27 tags files ... X-Git-Tag: 5.0-rc1~29 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=d51dfa22a9d2dd7b6251f4fb33f357caa97ac339 this is now the 5.0 build - adopting the new branches in the non-k27 tags files (onelab only for now) --- diff --git a/Makefile b/Makefile index 8f184a5c..2c819784 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ #################### # exported to spec files as plrelease -PLANETLAB_RELEASE = 4.3 +PLANETLAB_RELEASE = 5.0 # # Default values diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index b1b25c9b..31cbfb94 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -32,30 +32,23 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-41 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/trunk +pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 -# latest nodeconfig do not need build anymore -nodeconfig-MODULES := nodeconfig nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-1 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-5.0-1 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 -# latest trunk do not need build anymore -myplc-MODULES := MyPLC MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-1 sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 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 # locating the right test directory - see make tests_svnpath -tests-SVNPATH := http://svn.planet-lab.org/svn/tests/trunk +tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-0 ### temporary # nozomi not needed anymore for 2.6.27 ALL:=$(subst nozomi,,$(ALL)) IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS)) -# -# ipfw provides the feature inside nodes, so this is now deprecated -ALL:=$(subst dummynet_image,,$(ALL)) diff --git a/onelab-tags.mk b/onelab-tags.mk index 9b0c8d29..b237fdde 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -16,10 +16,9 @@ util-vserver-SVNBRANCH := 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-22 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNBRANCH := 1.8 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-1 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 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 @@ -33,30 +32,22 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-SVNBRANCH := 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-14 -dummynet_image-SVNPATH := http://svn.planet-lab.org/svn/dummynet_image/tags/dummynet_image-1.0-5 -PLCAPI-SVNBRANCH := 4.3 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-1 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-41 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 -nodeconfig-SVNBRANCH := 4.3 -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7 -BootManager-SVNBRANCH := 4.3 -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-16 +nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1 +BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-1 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -BootCD-SVNBRANCH := 4.2 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 -VserverReference-SVNBRANCH := 4.2 -VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16 -BootstrapFS-SVNBRANCH := 1.0 -BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11 -MyPLC-SVNBRANCH := 4.3 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37 +BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1 +VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 +BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-1 sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 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 # locating the right test directory - see make tests_svnpath -tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6 +tests-SVNPATH := http://svn.planet-lab.org/svn/tests/trunk diff --git a/onelab.mk b/onelab.mk index fd6d6ea9..faf28425 100644 --- a/onelab.mk +++ b/onelab.mk @@ -269,13 +269,6 @@ vsys-scripts-SPEC := vsys-scripts.spec IN_BOOTSTRAPFS += vsys-scripts ALL += vsys-scripts -# -# dummynet_image -# -dummynet_image-MODULES := dummynet_image -dummynet_image-SPEC := dummynet_image.spec -ALL += dummynet_image - # # plcapi # @@ -354,7 +347,7 @@ ALL += sfa # # nodeconfig # -nodeconfig-MODULES := nodeconfig build +nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig @@ -438,7 +431,7 @@ ALL += noderepo # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # -myplc-MODULES := MyPLC build +myplc-MODULES := MyPLC myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc diff --git a/planetlab-tags.mk b/planetlab-tags.mk index d3e556f4..37b2e9e4 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -14,6 +14,7 @@ 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-22 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 +NodeManager-SVNBRANCH := 1.8 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 @@ -35,12 +36,18 @@ PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLE www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 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-1/ +nodeconfig-SVNBRANCH := 4.3 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7 +BootManager-SVNBRANCH := 4.3 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-16 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 +BootCD-SVNBRANCH := 4.2 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 +VserverReference-SVNBRANCH := 4.2 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16 +BootstrapFS-SVNBRANCH := 1.0 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11 +MyPLC-SVNBRANCH := 4.3 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37 sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 diff --git a/planetlab.mk b/planetlab.mk index a0eb278f..76827186 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -300,6 +300,8 @@ ALL += sfa # # nodeconfig # +# xxx needed when upgrading to 5.0 +#nodeconfig-MODULES := nodeconfig nodeconfig-MODULES := nodeconfig build nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig @@ -390,6 +392,8 @@ IN_MYPLC += noderepo # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # +# xxx needed when upgrading to 5.0 +#myplc-MODULES := MyPLC myplc-MODULES := MyPLC build myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml