locally build inotify-tools on centos only

diff --git a/build.common b/build.common
index 40ced3d..eba44dd 100644 (file)
--- a/build.common
+++ b/build.common
@@ -64,7 +64,7 @@ function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in 
        f8|f9)
     distroname=$1; shift
     case $distroname in 
        f8|f9)

-           echo 'kernel* util-vserver* iptables iproute inotify-tools*'
+           echo 'kernel* util-vserver* iptables iproute'

            ;;
        centos5)
            echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
            ;;
        centos5)
            echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 3dc4b9c..6e84c01 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -78,12 +78,11 @@ package: pciutils-devel
 ##########
 # for vsys
 package: ocaml ocaml-docs 
 ##########
 # for vsys
 package: ocaml ocaml-docs 

-## will be loaded from our build as needed 
-#package:inotify-tools-devel 
+# use local inotify-tools on centos
+package:inotify-tools-devel 
+package-centos5: inotify-tools-devel

 ##########
 ## for util-vserver-pl
 ##########
 ## for util-vserver-pl

-# 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-centos5: libnl libnl-devel
+# use local libnl on centos
+package: libnl-devel
+package-centos5: libnl-devel

diff --git a/onelab.mk b/onelab.mk
index f0d4b74..40d0844 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -84,7 +84,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6

-# rebuild this on f8 and centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see kexcludes in build.common

 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"


@@ -196,20 +196,29 @@ IN_BOOTCD += iproute
 
 #
 # inotify-tools - local import
 
 #
 # inotify-tools - local import

-# could not find this in cen
+# rebuild this on centos5 (not found) - see kexcludes in build.common

 #
 #

+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
+
+ifeq "$(local_inotify_tools)" "true"

 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
 inotify-tools-BUILD-FROM-SRPM := yes
 IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
 inotify-tools-BUILD-FROM-SRPM := yes
 IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools

+ifeq "$(local_inotify_tools)" "true"

 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec

+ifeq "$(local_inotify_tools)" "true"

 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel

+endif

 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 

diff --git a/planetlab.mk b/planetlab.mk
index 9a69437..cc9ded7 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -63,7 +63,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6

-# rebuild this on f8 and centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see kexcludes in build.common

 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"


@@ -177,20 +177,29 @@ IN_BOOTCD += iproute
 
 #
 # inotify-tools - local import
 
 #
 # inotify-tools - local import

-# could not find this in cen
+# rebuild this on centos5 (not found) - see kexcludes in build.common

 #
 #

+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
+
+ifeq "$(local_inotify_tools)" "true"

 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
 inotify-tools-BUILD-FROM-SRPM := yes
 IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
 inotify-tools-BUILD-FROM-SRPM := yes
 IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools

+ifeq "$(local_inotify_tools)" "true"

 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec

+ifeq "$(local_inotify_tools)" "true"

 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel

+endif

 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
 IN_BOOTSTRAPFS += vsys
 ALL += vsys