X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=8340a9348d138dd057880f7f0fbec89c85f8800e;hb=06d917af18ac20f69c6a01819e1d8a59e81668ed;hp=75990a060b8fdbea5c0f67904c99dc3ddb8f8a4d;hpb=5367a7f596313baae89e7c1fbca3439b427db9d6;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 75990a06..8340a934 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -83,20 +83,31 @@ 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 centos5 - see kexcludes in build.common
 #
+local_libnl=false
+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-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
 
@@ -185,20 +196,29 @@ IN_BOOTCD += iproute
 
 #
 # 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
+endif
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-vsys-DEPEND-DEVEL-RPMS := inotify-tools-devel
+ifeq "$(local_inotify_tools)" "true"
+vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
@@ -352,3 +372,9 @@ ALL += myplc-native
 myplc-docs-MODULES := MyPLC PLCAPI NodeManager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
+
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := MyPLC
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release