correct module names

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index c8bef02..386b05f 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -1,25 +1,26 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 linux-2.6-BRANCH                := rhel6
-linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-5
+linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-6
 madwifi-BRANCH                 := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
 util-vserver-GITPATH            := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10
-util-vserver-BUILD-FROM-SRPM   := yes     # tmp
+util-vserver-BUILD-FROM-SRPM   := yes     # tmp
 util-vserver-pl-GITPATH         := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH            := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29
+nodemanager-GITPATH            := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet@pyplnet-4.3-7
 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-1
 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-BRANCH                        := 1.3.8
-iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+iptables-BUILD-FROM-SRPM        := yes # tmp
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
+iproute-BUILD-FROM-SRPM         := yes # tmp
+iproute2-GITPATH                := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4

diff --git a/config.coblitz/devel.pkgs b/config.coblitz/devel.pkgs
index 10add11..7965397 100644 (file)
--- a/config.coblitz/devel.pkgs
+++ b/config.coblitz/devel.pkgs
@@ -50,6 +50,8 @@ package: wget
 package: beecrypt-devel 
 package: tetex-latex
 package: gcc-c++ 
+package: patchutils
+package: binutils-devel
 # iptables
 package: linuxdoc-tools 
 package: sudo 
@@ -83,6 +85,8 @@ package: pciutils-devel
 package: ocaml.@arch@ ocaml-docs 
 # use local inotify-tools on centos
 package>=f8:inotify-tools-devel 
+# for util-vserver
+package: ctags
 ##########
 ## for util-vserver-pl
 # use local libnl on centos

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 1b1a9d4..511ec57 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -47,6 +47,8 @@ package: vconfig
 package: ntp
 package: pypcilib
 package: openvpn
+# make this explicit for f14 as we need mkfs.ext2 in bm
+package: e2fsprogs
 #################### formerly in prep.sh
 junk: lib/obsolete
 junk: lib/tls

diff --git a/module-tools.py b/module-tools.py
index a1b628d..6a2b77c 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -643,7 +643,6 @@ that for other purposes than tagging""" % options.workdir
 
         elif self.repository.type == "git":
             if hasattr(self,'branch'):
-                print "to branch", self.branch
                 self.repository.to_branch(self.branch)
             elif hasattr(self,'tagname'):
                 self.repository.to_tag(self.tagname)

diff --git a/modules.list b/modules.list
index 656209b..ab06d69 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -45,6 +45,6 @@ util-vserver
 util-vserver-pl
 util-vserver-pl:0.3
 vserver-reference
+vsys
 vsys-scripts
-vsys:0.9
 www-register-wizard

diff --git a/modules.update b/modules.update
index 0d7f9b2..12ebce3 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -3,15 +3,17 @@
 # redirect this into modules.list to get it refreshed
 #
 
-# keep centos5 as the default target rather than - more accurate - f8 b/c we need more of our modules on centos
-fcdistro=centos5
+# run on several distros as we filter out duplicates anyways
+# centos5 has more of our modules, but skips sfa
+fcdistros="centos5 f12"
 
-( \
-  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=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ; \
+( for fcdistro in $fcdistros; do 
+    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=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
+  done 2>/dev/null ;
   echo tests
 ) | sort -uf | grep -v '^build$' 

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 0eb8366..46fe38f 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -2,16 +2,16 @@
 
 ###
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-33
-madwifi-GITPATH                        := git://git.onelab.eu/madwifi.git@madwifi-4132-1
+madwifi-GITPATH                        := git://git.onelab.eu/madwifi.git@master
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iproute-BUILD-FROM-SRPM := yes 
-iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
 ###
-ipfw-GITPATH                   := git://git.onelab.eu/ipfw@ipfw-0.9-19
+ipfw-GITPATH                   := git://git.onelab.eu/ipfw@master
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
-planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
+planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@master
 ###
 util-vserver-BUILD-FROM-SRPM := yes # tmp
 util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-10
@@ -20,19 +20,18 @@ libnl-SVNPATH                       := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-0
-vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-24
+vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@master
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-57
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-9
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -45,11 +44,11 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
-nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-15
+nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@master
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
 vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-5
 bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-12

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index a1182a1..6743e4c 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -2,12 +2,12 @@
 
 ###
 linux-2.6-BRANCH               := rhel6
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-5
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-6
 madwifi-GITPATH                        := git://git.onelab.eu/madwifi.git@master
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iproute-BUILD-FROM-SRPM := yes 
-iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
 ###
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@master
 ###
@@ -21,19 +21,18 @@ libnl-SVNPATH                       := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-0
-vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-24
+vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@master
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-57
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-9
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -46,11 +45,11 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
-nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3
+nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@master
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
 vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-5
 bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-12

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 4041552..af2ae81 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -8,10 +8,10 @@ iptables-BRANCH                       := 1.3.8
 iptables-SVNPATH                := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
 iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.16-2
 ###
-ipfw-GITPATH                   := git://git.onelab.eu/ipfw@ipfw-0.9-19
+ipfw-GITPATH                   := git://git.onelab.eu/ipfw@master
 nozomi-GITPATH                 := git://git.onelab.eu/nozomi@nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
-planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
+planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@master
 ###
 util-vserver-BUILD-FROM-SRPM := yes # tmp
 util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-10
@@ -21,19 +21,18 @@ util-vserver-pl-BRANCH              := 0.3
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-0
-vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-24
+vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@master
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-57
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-9
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -46,11 +45,11 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
-nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
+nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@master
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
 vserver-reference-GITPATH       := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-5
 bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-12

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 13c83b4..e70327e 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -5,14 +5,14 @@ madwifi-GITPATH                       := git://git.planet-lab.org/madwifi.git@madwifi-4132-1
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
-iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
 util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10
 util-vserver-BUILD-FROM-SRPM := yes    # tmp
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-25
 # 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
@@ -23,7 +23,6 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-0
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-24

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 9f15707..0aa109e 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,19 +1,19 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 linux-2.6-BRANCH               := rhel6
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-5
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-6
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@master
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
-iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
 util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10
 util-vserver-BUILD-FROM-SRPM := yes    # tmp
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-25
 # 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
@@ -24,7 +24,6 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-0
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-24

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 88ab08e..30d39ce 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -16,13 +16,12 @@ util-vserver-pl-GITPATH             := git://git.planet-lab.org/util-vserver-pl.git@util-vs
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-24
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-25
 codemux-GITPATH                        := git://git.planet-lab.org/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-0
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-24