From: root Date: Thu, 2 Dec 2010 23:30:17 +0000 (-0500) Subject: Merge commit 'origin/master' X-Git-Tag: 5.0-rc17~49 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=81a6ee3f4ed99abf1d31571bf60e6018274f7cf2;hp=151547b1029f7f30868e2ffbb563bec502ab446a;p=build.git Merge commit 'origin/master' --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 2dd938aa..51853418 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -14,13 +14,13 @@ 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 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-9 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 (trunk). 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-22 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-23 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 diff --git a/onelab-tags.mk b/onelab-tags.mk index 2b8ba808..137d798b 100644 --- a/onelab-tags.mk +++ b/onelab-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@planetlab-umts-tools-0.6-5 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-9 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 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index d02aa2cd..bb20d6bc 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -6,13 +6,13 @@ 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.33-2 -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-9 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-22 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23 # 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 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 842b6eb9..f2e4b300 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -6,13 +6,13 @@ 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.33-2 -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-9 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-22 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23 # 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 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index d983e108..064a0b02 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -8,7 +8,7 @@ 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-8 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-9 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 @@ -16,7 +16,7 @@ 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-22 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 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