X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=wextoolbox.mk;h=99d682da53c0c9051d5403dfed2305ef2ce6c78f;hp=748a0d47b0f3063ee1d6595188e40673f2e86598;hb=8db68e5f4168ff629711428b7a2c1005c4ef4e78;hpb=ee8d63580076d63d109f02ffd0d927b005e17543

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 748a0d4..99d682d 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -62,7 +62,7 @@ sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk
 sge-DEVEL-RPMS += lesstif lesstif-devel
 
 # turning this off - current focus is on deploying the sge box separately from myplc
-# packaging is still broken, and we're exploring a ready-t-o-use distro on centos
+# packaging is still broken, and we're exploring a ready-to-use distro on centos
 # ALL += sge
 # IN_BOOTSTRAPFS += sge
 
@@ -148,6 +148,7 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes	
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -157,6 +158,7 @@ IN_BOOTSTRAPFS += iptables
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
+util-vserver-BUILD-FROM-SRPM := yes
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
@@ -167,9 +169,6 @@ 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 += 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
 
@@ -236,23 +235,6 @@ mom-SPEC := pl_mom.spec
 ALL += mom
 IN_BOOTSTRAPFS += mom
 
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see yumexclude
-#
-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
 #