Build the vanilla util-vserver branch, since Fedora's versions are too old.

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 40f0539..9379d1c 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -6,7 +6,7 @@ build-SVNPATH                   := http://svn.planet-lab.org/svn/build/trunk
 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-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
 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

diff --git a/planetlab.mk b/planetlab.mk
index 593dd08..2184a34 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,16 +56,15 @@ ALL += libnl
 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-DEPENDDEVELRPMS := libnl libnl-devel util-vserver-lib util-vserver-devel
+util-vserver-pl-DEPENDDEVELRPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl