From c50f2b763f7117a19c3f2ff99992cac2759bb591 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 22 Jun 2010 16:16:20 +0200 Subject: [PATCH] setting tags util-vserver-pl-0.4-12 and util-vserver-pl-0.3-31 - manual fix b/c of module-tag broken with old git --- onelab-k27-tags.mk | 2 +- onelab-tags.mk | 2 +- planetlab-k27-tags.mk | 2 +- planetlab-k32-tags.mk | 4 +--- planetlab-tags.mk | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index d356acbc..193ca763 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -16,7 +16,7 @@ util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.216-3 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-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/trunk +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-12 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk diff --git a/onelab-tags.mk b/onelab-tags.mk index 78ba0aa0..87441cdc 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -17,7 +17,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 # 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-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/branches/0.3 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index b1391bf9..ee2037ea 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -9,7 +9,7 @@ iproute-BUILD-FROM-SRPM := yes # tmp util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.216-3 util-vserver-BUILD-FROM-SRPM := yes # tmp 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.4-11 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-12 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 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-2.0-8 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 62a2580b..56c66035 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -9,9 +9,7 @@ iproute-BUILD-FROM-SRPM := yes # tmp util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.216-3 util-vserver-BUILD-FROM-SRPM := yes # tmp libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 -# Trellis is using a modified util-vserver-pl with the 2.6.27 kernel -# initial tag would be tags/util-vserver-pl-0.4-11 -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-11 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-12 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 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-2.0-8 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 358f9afb..d4f5dc09 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -10,7 +10,7 @@ iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16 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-30 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/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 -- 2.47.0