X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=2b332238481379e4ba9b223cd849e6808c72d0a6;hb=ea9ccb44eae4906c757706abccec8f1d299eb3d0;hp=4c5a740fe8bc7eb90d6f306920979ee62d1f2e88;hpb=6f07834e854bc82c3096c0640a12ba0873154b96;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 4c5a740f..2b332238 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -23,8 +23,6 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS += iwlwifi=1 
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
 
@@ -59,6 +57,9 @@ ALL += ipfwslice
 #
 # madwifi
 #
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
@@ -68,6 +69,8 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+endif
+endif
 
 #
 # comgt
@@ -98,7 +101,7 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
+iptables-BUILD-FROM-SRPM := yes	
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -108,7 +111,7 @@ IN_BOOTSTRAPFS += iptables
 #
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
-iproute-BUILD-FROM-SRPM	:= yes	
+iproute-BUILD-FROM-SRPM := yes	
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute
@@ -128,7 +131,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see yumexclude
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
@@ -208,11 +211,13 @@ IN_BOOTSTRAPFS += fprobe-ulog
 #
 # DistributedRateLimiting
 #
+# on f16 somehow configure screws up and defines LDFLAGS=-Wl,-z,relro which ld does not like..
+ifneq "$(DISTRONAME)" "f16"
 DistributedRateLimiting-MODULES := DistributedRateLimiting
 DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
 ALL += DistributedRateLimiting
 IN_NODEREPO += DistributedRateLimiting
-
+endif
 
 #
 # pf2slice
@@ -231,13 +236,17 @@ IN_BOOTSTRAPFS += mom
 
 #
 # inotify-tools - local import
-# rebuild this on centos5 (not found) - see kexcludes in build.common
+# rebuild this on centos5 (not found) - see yumexclude
 #
 local_inotify_tools=false
 ifeq "$(DISTRONAME)" "centos5"
 local_inotify_tools=true
 endif
 
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
 ifeq "$(local_inotify_tools)" "true"
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
@@ -252,7 +261,8 @@ endif
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_BOOTSTRAPFS += openvswitch
+# maybe not in production yet
+#IN_BOOTSTRAPFS += openvswitch
 ALL += openvswitch
 
 #
@@ -268,6 +278,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
 #
 # vsys-scripts
 #
@@ -325,16 +343,6 @@ monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
-#
-# zabbix
-#
-zabbix-MODULES := monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-### turn this off as zabbix comes with stock fedora or epel
-###ALL += zabbix
-
 #
 # PLC RT
 #
@@ -342,6 +350,8 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
 # pyopenssl
 #
@@ -349,6 +359,7 @@ pyopenssl-MODULES := pyopenssl
 pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
+endif
 
 #
 # pyaspects
@@ -524,6 +535,7 @@ ALL += slicerepo
 #
 myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
 
 # myplc-docs only contains docs for PLCAPI and NMAPI, but