#
# procprotect: root context module for protecting against weaknesses in /proc
#
+### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
procprotect-MODULES := procprotect
procprotect-SPEC := procprotect.spec
ALL += procprotect
IN_NODEIMAGE += procprotect
+endif
#
# ipfw: root context module, and slice companion
#
-# this module won't build yet under f20
-ifeq "$(DISTRONAME)" "f18"
+### starting August 2015, ipfw module won't build against fedora22
+# that comes with kernel 4.1.4
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22)"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
IN_NODEIMAGE += ipfwroot
+endif
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
-endif
#
# comgt - a companion to umts tools
#
# fprobe-ulog
#
+# xxx temporarily turning this off on f20 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
+endif
#################### libvirt version selection
-# settling with using version 1.2.1 on all fedoras
-# although this does not solve the slice re-creation issue seen on f20
+# use fedora's libvirt starting with f22
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
local_libvirt=true
-separate_libvirt_python=true
+endif
#
# libvirt
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
+# 1.2.11
+libvirt-STOCK-DEVEL-RPMS += wireshark-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
-endif
-
#
## libvirt-python
#
-ifeq "$(separate_libvirt_python)" "true"
-
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
libvirt-python-STOCK-DEVEL-RPMS += pm-utils
+# for 1.2.11
+libvirt-python-STOCK-DEVEL-RPMS += python-nose
+# it would make sense to do something like this if we wanted to
+# build against python3 as well, but for now I turned this feature off
+# in libvirt-python
+#ifeq "$(distro)" "Fedora"
+#xxx if $(distrorelease) > 18
+#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml
+#endif
+#endif
libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt-python
IN_NODEREPO += libvirt-python
IN_NODEIMAGE += libvirt-python
-endif
+endif # local_libvirt
#
# DistributedRateLimiting