From 0726c4761addc79f61b3c44cdd4e6051e47fbc27 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 27 Sep 2008 21:46:15 +0000
Subject: [PATCH] use stock libnl on f[89] and try to rebuild on centos

---
 build.common                | 12 ++++++------
 config.planetlab/devel.pkgs |  1 -
 onelab.mk                   |  3 ---
 planetlab.mk                |  3 ---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/build.common b/build.common
index 30c3c0e4..40ced3d4 100644
--- a/build.common
+++ b/build.common
@@ -58,17 +58,17 @@ function pl_getReleaseName () {
     return 0
 }
 
-# we use libnl from fedora 9 stock;
-# on f8 and centos5 we build it locally
+# on fedora 8 or 9, we use libnl from the stock repos
+# on centos5 we build it locally
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in 
-	f8|centos5)
-	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
-	    ;;
-	f9)
+	f8|f9)
 	    echo 'kernel* util-vserver* iptables iproute inotify-tools*'
 	    ;;
+	centos5)
+	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+	    ;;
 	*)
 	    echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
 	    ;;
diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 4d3447a5..3dc4b9c0 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -86,5 +86,4 @@ package: ocaml ocaml-docs
 # centos5 comes with something too old
 # use our version as well on f8 as it comes with some 1.0 - which would do however
 package: libnl libnl-devel
-package-f8: libnl libnl-devel
 package-centos5: libnl libnl-devel
diff --git a/onelab.mk b/onelab.mk
index 23e711f0..f0d4b743 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -87,9 +87,6 @@ IN_BOOTSTRAPFS += util-vserver
 # rebuild this on f8 and centos5 - see kexcludes in build.common
 #
 local_libnl=false
-ifeq "$(DISTRONAME)" "f8"
-local_libnl=true
-endif
 ifeq "$(DISTRONAME)" "centos5"
 local_libnl=true
 endif
diff --git a/planetlab.mk b/planetlab.mk
index ed31bbb8..9a694377 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -66,9 +66,6 @@ IN_BOOTSTRAPFS += util-vserver
 # rebuild this on f8 and centos5 - see kexcludes in build.common
 #
 local_libnl=false
-ifeq "$(DISTRONAME)" "f8"
-local_libnl=true
-endif
 ifeq "$(DISTRONAME)" "centos5"
 local_libnl=true
 endif
-- 
2.43.0