update currently used branches

diff --git a/modules.list b/modules.list
index fcf8395..210f396 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -15,6 +15,7 @@ comgt
 drupal
 dummynet_image
 fprobe-ulog
+geniwrapper
 inotify-tools
 iproute2
 iptables
@@ -29,11 +30,11 @@ nozomi
 pf2slice
 pl_sshd
 planetlab-umts-tools
+pyopenssl
 pypcilib
 pyplnet
 util-vserver-pl
 util-vserver:scholz
 vsys-scripts
-vsys-scripts:0.9
 vsys:0.9
 www-register-wizard

diff --git a/modules.update b/modules.update
index fb8caa9..8630c48 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -2,8 +2,12 @@
 
 # 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 distro in onelab planetlab ; do
-    tags=${distro}-tags.mk 
-    make stage1=true PLDISTRO=${distro} PLDISTROTAGS=${tags} DISTRONAME=centos5 module-tools 
-done | sort -u | grep -v '^build$'
+
+# keep centos5 as the default target rather than - more accurate - f8 b/c we need more of our modules on centos
+fcdistro=centos5
+
+( \
+  make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
+  make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
+  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
+) | sort -u | grep -v '^build$'