keeping track of modules for the trunk as well

diff --git a/modules.list b/modules.list
index 9231cb1..b7f08ea 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -1,16 +1,15 @@
 BootCD
-BootManager:3.2
+BootManager
 BootstrapFS
 CoDemux
-Mom:2.2
+Mom
 Monitor
-MyPLC:4.2
-NodeManager:1.7
+MyPLC
+NodeManager
 NodeUpdate
-PLCAPI:4.2
-PLCAPI:dummynet
+PLCAPI
 PLCWWW
-PLCWWW:onelab.4.2
+PLCWWW:onelab.5.0
 PingOfDeath
 VserverReference
 fprobe-ulog
@@ -19,7 +18,7 @@ iptables
 libnl
 linux-2.6
 madwifi
-nodeconfig:4.2
+nodeconfig
 pf2slice
 pl_sshd
 pypcilib

diff --git a/modules.update b/modules.update
index 4ab3373..9668629 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -3,4 +3,4 @@
 # redirect this into modules.list to get it refreshed
 #
 # we set DISTRONAME as this cannot be correctly guessed from the build box root context
-for tags in *tags*4.2.mk ; do make stage1=true PLDISTROTAGS=$tags DISTRONAME=f8 module-tools ; done | sort -u | grep -v '^build$'
+for tags in *tags.mk ; do make stage1=true PLDISTROTAGS=$tags DISTRONAME=f8 module-tools ; done | sort -u | grep -v '^build$'

diff --git a/onelab-tags.mk b/onelab-tags.mk
index faee7d0..9e15961 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -7,6 +7,7 @@ wireless-tools-SVNPATH          := http://svn.planet-lab.org/svn/wireless-tools/trunk
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
+util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/trunk
@@ -20,7 +21,8 @@ Mom-SVNPATH                   := http://svn.planet-lab.org/svn/Mom/trunk
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
-PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/branches/dummynet
+PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
+PLCWWW-SVNBRANCH               := onelab.5.0
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/branches/onelab.5.0
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/trunk
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/trunk

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index c3a2a07..558bfb3 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -5,6 +5,7 @@ linux-2.6-SVNPATH               := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
+util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/trunk