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
#
# 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
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
#
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
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += 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
#
# 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"
#
# 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
#
# 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
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
#
IN_BOOTSTRAPFS += vsys
ALL += vsys
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
#
# vsys-scripts
#
#
# 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
#
plcrt-SPEC := plcrt.spec
ALL += plcrt
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
#
# pyopenssl
#
pyopenssl-SPEC := pyOpenSSL.spec
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
+endif
#
# pyaspects
endif
# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
+# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
build_sfa=true
-ifeq "$(DISTRONAME)" "centos5"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
build_sfa=false
endif
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
-endif
sface-MODULES := sface
sface-SPEC := sface.spec
ALL += sface
+endif
#
# nodeconfig
# OML measurement library
#
oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel libpcap-devel check
+oml-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
# 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