From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 29 Aug 2008 02:49:05 +0000 (+0000)
Subject: Use the system libnl.
X-Git-Tag: 4.2-rc21^2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=95c8a5b53868caca8ee7b2661dd1402b881d460f;p=build.git

Use the system libnl.
---

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 294aecca..4a07e56a 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -80,3 +80,5 @@ package: ocaml ocaml-docs inotify-tools-devel
 package-fc4: ocaml ocaml-docs inotify-tools-devel 
 package-fc6: ocaml ocaml-docs inotify-tools-devel 
 package-centos5: ocaml ocaml-docs inotify-tools-devel 
+# util-vserver-pl
+package: libnl libnl-devel
diff --git a/modules.list b/modules.list
index 44475aa7..2d9e0c31 100644
--- a/modules.list
+++ b/modules.list
@@ -16,7 +16,6 @@ VserverReference
 fprobe-ulog
 iproute2
 iptables
-libnl
 linux-2.6
 madwifi
 nodeconfig:4.2
diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 6a41a0c3..d11c1ffe 100644
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -8,7 +8,6 @@ linux-2.6-SVNPATH		:= http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-
 madwifi-SVNPATH			:= http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
 nozomi-SVNPATH			:= http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH			:= http://svn.one-lab.org/comgt/imports/0.3
-libnl-SVNPATH 			:= http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
 util-vserver-SVNBRANCH		:= scholz
 util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4
 util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-11
diff --git a/onelab.mk b/onelab.mk
index fb68ca48..d201f5f3 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -84,17 +84,6 @@ comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
-#
-# libnl
-#
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
-#
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
-
 #
 # util-vserver
 #
@@ -109,7 +98,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl
 
diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index d8f134b7..58e9b4d0 100644
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -2,7 +2,6 @@
 
 linux-2.6-SVNPATH		:= http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-25
 madwifi-SVNPATH			:= http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
-libnl-SVNPATH 			:= http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
 util-vserver-SVNBRANCH		:= scholz
 util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4
 util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-11
diff --git a/planetlab.mk b/planetlab.mk
index 6b4892ea..2f2133b0 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -63,17 +63,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# libnl
-#
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
-#
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
-
 #
 # util-vserver
 #
@@ -88,7 +77,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl