ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on f18 and f20
-local_libvirt=false
-separate_libvirt_python=false
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
+#################### 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
+
local_libvirt=true
-ifeq "$(DISTRONAME)" "f20"
separate_libvirt_python=true
-endif
-endif
-
-ifeq "$(local_libvirt)" "true"
#
# libvirt
#
+ifeq "$(local_libvirt)" "true"
+
libvirt-MODULES := libvirt
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
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)" "$(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 libgcrypt-devel netcf-devel
-endif
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
+
endif
-ifeq "$(separate_libvirt_python)" "true"
#
## libvirt-python
#
+ifeq "$(separate_libvirt_python)" "true"
+
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
ALL += libvirt-python
IN_NODEREPO += libvirt-python
IN_NODEIMAGE += libvirt-python
+
endif
#
IN_BOOTCD += pyplnet
#
-# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
+# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
#
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
rvm-ruby-MODULES := rvm-ruby
rvm-ruby-SPEC := rpm/rvm-ruby.spec
rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
-#ALL += rvm-ruby
+ALL += rvm-ruby
+endif
#
# OML measurement library