ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on f18, and the stock version later on
-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
# 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
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
endif
-libvirt-RPMFLAGS := --define 'packager PlanetLab'
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
+libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils
+libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt-python
IN_NODEREPO += libvirt-python
ALL += plcapi
IN_MYPLC += plcapi
-#
-# mod_python
-#
-# this was dropped in fedora18, at which point the intention has been to
-# move to wsgi instead; however our using wsgi currently looks unstable
-# so you have the option to install this manually, in which case myplc will
-# swap to using mod_python - see plc.d/httpd
-ifeq "$(DISTRO)" "Fedora"
-ifneq "$(DISTRONAME)" "f16"
-mod_python-MODULES := mod_python
-mod_python-SPEC := mod_python.spec
-mod_python-STOCK-DEVEL-RPMS := httpd-devel
-mod_python-BUILD-FROM-SRPM := yes
-ALL += mod_python
-endif
-endif
-
#
# drupal
#