Merge branch 'master' of ssh://git.onelab.eu/git/build

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

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 8497d88..c92f186 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -10,7 +10,7 @@ kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@master
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-5
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
 ###
@@ -21,7 +21,7 @@ libnl-GITPATH                 := git://git.onelab.eu/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@lxc_devel
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
 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-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
@@ -30,6 +30,8 @@ Mom-SVNPATH                   := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-2
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-41
+autoconf-GITPATH               := git://git.onelab.eu/autoconf@master
+sliver-openvswitch-GITPATH     := git://git.onelab.eu/sliver-openvswitch.git@master
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
 drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-72