a few tweaks for having modules.list correctly updated

diff --git a/Makefile b/Makefile
index a865858..6fbc211 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -667,8 +667,10 @@ branches:
 
 module-tools:
        @$(foreach module,$(ALL-MODULES), \
-         echo $(module); \
-         $(if $($(module)-SVNBRANCH),echo $(module):$($(module)-SVNBRANCH);))
+        $(if $($(module)-SVNPATH), \
+         $(if $($(module)-SVNBRANCH), \
+            echo $(module):$($(module)-SVNBRANCH); , \
+            echo $(module); )))
 
 info: packages modules branches 
 

diff --git a/modules.list b/modules.list
index 4d92ad6..b0a5ebf 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -2,11 +2,8 @@ BootCD
 BootManager
 BootstrapFS
 CoDemux
-Mom
 Mom:2.2
-Monitor
 MyPLC
-NodeManager
 NodeManager:1.7
 NodeUpdate
 PLCAPI
@@ -15,14 +12,12 @@ PLCWWW:onelab.4.2
 PingOfDeath
 PlanetFlow
 VserverReference
-build
 fprobe-ulog
 iproute2
 iptables
-kexec-tools
 libhttpd++
 libnl
-linux-patches
+linux-2.6
 madwifi
 nodeconfig
 pf2slice
@@ -30,6 +25,6 @@ pl_sshd
 proper
 pypcilib
 ulogd
-util-vserver
 util-vserver-pl
+util-vserver:scholz
 wireless-tools

diff --git a/modules.update b/modules.update
index 56e3a6c..4f44356 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -2,4 +2,4 @@
 
 # redirect this into modules.list to get it refreshed
 
-for tags in *tags*mk ; do make stage1=true PLDISTROTAGS=$tags module-tools ; done | sort -u
+for tags in *tags*4.2.mk ; do make stage1=true PLDISTROTAGS=$tags module-tools ; done | sort -u | grep -v '^build$'

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index b049b1b..9202d54 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -5,12 +5,13 @@
 # that serves as the default for module-tools -a
 
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-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-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

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 6a0ae9d..1d51b73 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -1,7 +1,7 @@
 # $Id$
 
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-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/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk

diff --git a/onelab.mk b/onelab.mk
index 932e424..2507f1d 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -17,7 +17,7 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
+kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"

diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index 2d9acb1..4c61361 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -2,10 +2,11 @@
 
 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
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
+util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-3
 # not stable yet
 util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-2

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 86c6380..f168bdf 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,7 +1,7 @@
 # $Id$
 
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-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/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk

diff --git a/planetlab.mk b/planetlab.mk
index b1d4645..de91b8e 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -17,7 +17,7 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
+kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"