use build branch 4.3 for maintenance after 4.3-rc17

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
deleted file mode 100644 (file)
index b1b25c9..0000000
--- a/onelab-k27-tags.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# $URL$
-
-# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
-
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
-# this should build
-ipfwsrc-SVNPATH                 := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-9
-madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
-comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
-planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
-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
-PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-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
-fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0
-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-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.1.1-1
-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-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
-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/trunk
-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
-
-### 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/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
deleted file mode 100644 (file)
index 58d8277..0000000
--- a/planetlab-k27-tags.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-# $URL$
-
-# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
-
-# trying the 2.6.27 kernel
-# VINI is running a prototype of a 2.6.27-based PlanetLab node (aka Trellis)
-# Below we include a few Trellis versions of packages 
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
-madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
-# Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
-# this branch is numbered 0.30.216-pre2833 in the specfile
-# initial tag would be util-vserver-0.30.216-pre2833-0
-util-vserver-SVNBRANCH         := trellis
-util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/trellis
-libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-# this branch is numbered 0.4 in the specfile
-# initial tag would be tags/util-vserver-pl-0.4-3
-util-vserver-pl-SVNBRANCH      := trellis
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
-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-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23
-# Trellis-specific NodeManager plugins 
-NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
-NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
-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
-fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0
-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-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
-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-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
-PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
-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
-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-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
-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-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
-VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
-BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
-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
-PLCRT-SVNPATH                   := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
-
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                   := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6