From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 27 Sep 2008 15:43:21 +0000 (+0000)
Subject: about libnl
X-Git-Tag: 4.3-rc1~164
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f34e89e86e7f6aa39a9c93b81edcedd174bf00b9;p=build.git

about libnl
- f8: use our own import (1.1 rather that 1.0)
- f9: use the fedora stock repos (1.1 is ok, and our version does not compile)
- centos5: using our local import
NOTE: this does not compile on centos5
  this is because libnl needs /usr/include/linux/if_vlan.h
  that comes with kernel-headers rather than kernel-devel
  so at build time we use the wrong version...
---

diff --git a/build.common b/build.common
index c180d8d9..30c3c0e4 100644
--- a/build.common
+++ b/build.common
@@ -58,14 +58,16 @@ function pl_getReleaseName () {
     return 0
 }
 
+# we use libnl from fedora 9 stock;
+# on f8 and centos5 we build it locally
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in 
-	f*)
+	f8|centos5)
 	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
 	    ;;
-	centos*)
-	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+	f9)
+	    echo 'kernel* util-vserver* iptables iproute inotify-tools*'
 	    ;;
 	*)
 	    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 bcc3ad12..4d3447a5 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -75,10 +75,16 @@ package: PyXML
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
+##########
 # for vsys
 package: ocaml ocaml-docs 
 ## will be loaded from our build as needed 
 #package:inotify-tools-devel 
+##########
 ## for util-vserver-pl
-## ditto
-#package: libnl libnl-devel
+# we can use the stock version with f9; 
+# 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 64922ca8..23e711f0 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -83,21 +83,34 @@ IN_BOOTSTRAPFS += util-vserver
 
 #
 # libnl - local import
-# the version available in centos 5.2 is too old
 # we need either 1.1 or at least 1.0.pre6
+# 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
+
+ifeq "$(local_libnl)" "true"
 libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
+endif
 
 #
 # util-vserver-pl
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core libnl libnl-devel
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core 
+ifeq "$(local_libnl)" "true"
+util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+endif
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl
 
diff --git a/planetlab.mk b/planetlab.mk
index 4ec43fa4..ed31bbb8 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -62,21 +62,36 @@ IN_BOOTSTRAPFS += util-vserver
 
 #
 # libnl - local import
-# the version available in centos 5.2 is too old
 # we need either 1.1 or at least 1.0.pre6
+# 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
+
+ifeq "$(local_libnl)" "true"
 libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
+# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
+libnl-DEPEND-DEVEL-RPMS := kernel-devel
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
+endif
 
 #
 # util-vserver-pl
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core libnl libnl-devel
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core 
+ifeq "$(local_libnl)" "true"
+util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+endif
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl