From b9b1dfdb163a57e440a0c9d74c85cf5d492fa74d Mon Sep 17 00:00:00 2001
From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 30 Nov 2007 19:12:39 +0000
Subject: [PATCH] util-vserver-pl

---
 groups/planetlab.xml |  2 +-
 planetlab-devel.lst  |  5 ++++-
 planetlab-tags.mk    |  1 +
 planetlab.mk         | 14 ++++++++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/groups/planetlab.xml b/groups/planetlab.xml
index 55615e0f..817a4b1a 100644
--- a/groups/planetlab.xml
+++ b/groups/planetlab.xml
@@ -103,7 +103,7 @@
       <packagereq type="mandatory">util-vserver-core</packagereq>
       <packagereq type="mandatory">util-vserver-sysv</packagereq>
       <packagereq type="mandatory">util-vserver-legacy</packagereq>
-      <packagereq type="mandatory">util-vserver-python</packagereq>
+      <packagereq type="mandatory">util-vserver-pl</packagereq>
       <packagereq type="mandatory">util-python</packagereq>
       <packagereq type="mandatory">NodeManager</packagereq>
       <packagereq type="mandatory">NodeUpdate</packagereq>
diff --git a/planetlab-devel.lst b/planetlab-devel.lst
index 1835a0bc..27d712c8 100644
--- a/planetlab-devel.lst
+++ b/planetlab-devel.lst
@@ -37,13 +37,16 @@ package+f8: popt-devel
 # kernel
 package: gnupg 
 package: diffutils 
-# util-vserver
+# util-vserver-pl
 package: vconfig 
 package: iptables 
 package: wget 
 package: beecrypt-devel 
 package: tetex-latex
 package: gcc-c++ 
+package: util-vserver-lib
+package: util-vserver-devel
+package: util-vserver-core
 # ulogd
 package: libpcap libpcap-devel 
 # iptables
diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 259fb416..40f05394 100644
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -7,6 +7,7 @@ linux-patches-SVNPATH		:= http://svn.planet-lab.org/svn/linux-2.6/trunk
 # 
 libnl-SVNPATH 			:= http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/trunk
+util-vserver-pl-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH		:= http://svn.planet-lab.org/svn/NodeUpdate/trunk
 PingOfDeath-SVNPATH		:= http://svn.planet-lab.org/svn/PingOfDeath/trunk
 NodeManager-SVNPATH		:= http://svn.planet-lab.org/svn/NodeManager/trunk
diff --git a/planetlab.mk b/planetlab.mk
index 7aa914c0..78917be6 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -57,8 +57,18 @@ util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
 util-vserver-DEPENDDEVELS := libnl
-ALL += util-vserver
-IN_BOOTSTRAPFS += util-vserver
+#ALL += util-vserver
+#IN_BOOTSTRAPFS += util-vserver
+
+#
+# util-vserver-pl
+#
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-DEPENDDEVELS := libnl
+util-vserver-pl-DEPENDDEVELRPMS := util-vserver-lib util-vserver-devel
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
 
 #
 # NodeUpdate
-- 
2.43.0