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

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 2273a60b..83d105cd 100644
--- a/modules.list
+++ b/modules.list
@@ -15,7 +15,6 @@ VserverReference
 fprobe-ulog
 iproute2
 iptables
-libnl
 linux-2.6
 madwifi
 nodeconfig
diff --git a/onelab.mk b/onelab.mk
index 0e51e189..b96a12fe 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.mk b/planetlab.mk
index 632df83b..d592e291 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