#
# ipfw: root context module, and slice companion
#
-# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore
-#ifeq "$(DISTRONAME)" "f16"
+# this module won't build yet under f20
+ifeq "$(DISTRONAME)" "f18"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
-#endif
+endif
#
# comgt - a companion to umts tools
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on all distros for now
-#local_libvirt=false
-#ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on f18, and the stock version later on
+local_libvirt=false
+separate_libvirt_python=false
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
local_libvirt=true
-#endif
+ifeq "$(DISTRONAME)" "f20"
+separate_libvirt_python=true
+endif
+endif
+
ifeq "$(local_libvirt)" "true"
#
libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
+# for 1.2.1 - first seen on f20, not sure for the other ones
+libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
+
ifeq "$(DISTRONAME)" "f16"
libvirt-STOCK-DEVEL-RPMS += libnl-devel libudev-devel
endif
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
-ifeq "$(DISTRONAME)" "f18"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel
endif
libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
IN_NODEIMAGE += libvirt
endif
+ifeq "$(separate_libvirt_python)" "true"
+#
+## libvirt-python
+#
+libvirt-python-MODULES := libvirt-python
+libvirt-python-SPEC := libvirt-python.spec
+libvirt-python-BUILD-FROM-SRPM := yes
+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
+
#
# DistributedRateLimiting
#
sfa-SPEC := sfa.spec
ALL += sfa
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
+#sface-MODULES := sface
+#sface-SPEC := sface.spec
+#ALL += sface
endif
##############################