From: Thierry Parmentelat Date: Tue, 1 Feb 2011 16:23:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc18~11 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=90dd7fb971bdcc3b8a49b2f7cd3d70270d611669;hp=89882652bda7b49174d736ef16ed6f1488623d7b;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/coblitz-unstable-tags.mk b/coblitz-unstable-tags.mk index 6ed5a90b..2653893c 100644 --- a/coblitz-unstable-tags.mk +++ b/coblitz-unstable-tags.mk @@ -4,7 +4,7 @@ mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-0 linux-2.6-BRANCH := rhel6 linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-10 madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@master -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-12 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 diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk index fa44131d..959a856e 100644 --- a/onelab-k22-tags.mk +++ b/onelab-k22-tags.mk @@ -14,7 +14,7 @@ comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-12 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 util-vserver-pl-BRANCH := 0.3 diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 9bfba41a..0ec1ee4d 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -14,7 +14,7 @@ comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-12 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21 diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 4d23a7dc..65f014fc 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -18,7 +18,7 @@ comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-12 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21 diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk index 75b9068e..5ddb59fc 100644 --- a/planetbridge-tags.mk +++ b/planetbridge-tags.mk @@ -8,7 +8,7 @@ util-vserver-BRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/nodeupdate-0.5-7 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-7 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 0372162c..1d6debe3 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -6,11 +6,11 @@ iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptable iptables-BUILD-FROM-SRPM := yes # tmp iproute-BUILD-FROM-SRPM := yes 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-11 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-12 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 +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.git@nodemanager-2.0-26 # Trellis-specific NodeManager plugins diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 13b2bfd7..4c73aee3 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -9,11 +9,11 @@ iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptable iptables-BUILD-FROM-SRPM := yes # tmp iproute-BUILD-FROM-SRPM := yes 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-11 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-12 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 +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.git@nodemanager-2.0-26 # Trellis-specific NodeManager plugins diff --git a/planetlab-tags.mk b/planetlab-tags.mk index aa40fefd..ba3ed876 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -8,12 +8,12 @@ iptables-BRANCH := 1.3.8 iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12 iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.16-2 util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-12 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk). util-vserver-pl-BRANCH := 0.3 util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.3-32 -nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6 +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 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-26 diff --git a/trellis-tags.mk b/trellis-tags.mk index 6910c302..029e8232 100644 --- a/trellis-tags.mk +++ b/trellis-tags.mk @@ -11,7 +11,7 @@ util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/tre libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-BRANCH := trellis util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/nodeupdate-0.5-7 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23 # Trellis-specific NodeManager plugins