X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=7ac07d4da72f1f18b77eeec2f2c4ba8c2077c18a;hb=refs%2Fheads%2Frc26-fixes;hp=141ab28139b305a904e1405c17ab1f3f1b30eaca;hpb=386e05e41d044d046b523a2301f2def0ccfa09bc;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 141ab281..7ac07d4d 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,18 +69,8 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
-
-# 
-# nozomi
-# 
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS += kernel-devel
-nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += nozomi
-ALL += nozomi
+endif
+endif
 
 #
 # comgt
@@ -110,9 +101,7 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif
+iptables-BUILD-FROM-SRPM := yes	
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -122,6 +111,7 @@ IN_BOOTSTRAPFS += iptables
 #
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes	
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute
@@ -132,7 +122,9 @@ IN_BOOTCD += iproute
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
 
@@ -224,7 +216,6 @@ DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
 ALL += DistributedRateLimiting
 IN_NODEREPO += DistributedRateLimiting
 
-
 #
 # pf2slice
 #
@@ -249,6 +240,10 @@ 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
@@ -263,7 +258,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
 
 #
@@ -279,6 +275,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
 #
@@ -330,21 +334,12 @@ ALL += pcucontrol
 #
 # monitor
 #
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
 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
-ALL += zabbix
-
 #
 # PLC RT
 #
@@ -352,6 +347,8 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
 # pyopenssl
 #
@@ -359,6 +356,7 @@ pyopenssl-MODULES := pyopenssl
 pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
+endif
 
 #
 # pyaspects
@@ -449,6 +447,14 @@ omf-expctl-MODULES := omf
 omf-expctl-SPEC := omf-expctl.spec
 ALL += omf-expctl
 
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel 
+oml-SPEC := liboml.spec
+ALL += oml
+
 #
 # bootcd
 #
@@ -532,7 +538,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs