a few tweaks for having modules.list correctly updated

[build.git] / onelab-tags-4.2.mk

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 609bdba..9202d54 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -1,41 +1,39 @@
 # $Id$
 
+# SVNBRANCH specifications are not used at build-time, 
+# but by modules.update to refresh modules.list 
+# that serves as the default for module-tools -a
+
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-# not stable yet
-linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
+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-0.9.3.3-1
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
-util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-2
-# not stable yet
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
+util-vserver-SVNBRANCH         := scholz
+util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-3
+util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-2
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-2
 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.7-5
+NodeManager-SVNBRANCH          := 1.7
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-7
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
 libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-0.1.4-1
 proper-SVNPATH                 := http://svn.planet-lab.org/svn/proper/tags/proper-0.3-37
-# not stable yet
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-9
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/tags/ulogd-1.24-4
-# not stable yet
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/trunk
-# not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3
-Mom-branch                     := 2.2
+Mom-SVNBRANCH                  := 2.2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-3
-# not stable yet
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-1
-# not stable yet
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-4
-# need tagging tool
-#PLCWWW-SVNPATH                        := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-4.2-1
-PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/branches/onelab
+PLCWWW-SVNBRANCH               := onelab.4.2
+PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-onelab.4.2-8
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-3
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-5
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-1