ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on f18 and f20
-local_libvirt=false
+#################### libvirt version selection
+# for now things are a bit confused
+# on f18 we build with our own 1.0.4 and that works fine
+# on f20 we have tried the mainstream (1.1.3) libvirt,
+# as well as the latest 1.2.1 release, and both exhibit an issue that needs to be fixed
+# in addition once this is done we might need to have f18+1.2.1 as well
+# so for now we leave the option to set the following on the command line
+# LIBVIRT=104 (for f18)
+# LIBVIRT=mainstream (for f20)
+# LIBVIRT=121 (for f18 or f20)
+
+# set default according to distro
+ifeq "$(LIBVIRT)" ""
+ifeq "$(DISTRONAME)" "f18"
+LIBVIRT=104
+else
+LIBVIRT=121
+endif
+endif
+
+ifeq "$(LIBVIRT)" "104"
+local_libvirt=true
separate_libvirt_python=false
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
+libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3
+endif
+
+ifeq "$(LIBVIRT)" "121"
local_libvirt=true
-ifeq "$(DISTRONAME)" "f20"
separate_libvirt_python=true
-endif
+libvirt-GITPATH := git://git.onelab.eu/libvirt.git@1.2.1
+libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@1.2.1
endif
+ifeq "$(LIBVIRT)" "mainstream"
+local_libvirt=false
+endif
-ifeq "$(local_libvirt)" "true"
#
# libvirt
#
+ifeq "$(local_libvirt)" "true"
+
libvirt-MODULES := libvirt
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
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