handle separate libvirt-python 1.2.1

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 1749d4f..ec83056 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -137,10 +137,15 @@ IN_NODEIMAGE += fprobe-ulog
 
 #################### using our own libvirt on f18, and the stock version later on
 local_libvirt=false
-ifeq "$(DISTRONAME)" "f18"
+separate_libvirt_python=false
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
 local_libvirt=true
+ifeq "$(DISTRONAME)" "f20"
+separate_libvirt_python=true
+endif
 endif
 
+
 ifeq "$(local_libvirt)" "true"
 #
 # libvirt
@@ -153,6 +158,9 @@ libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnu
 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
@@ -167,6 +175,19 @@ IN_NODEREPO += 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-RPMFLAGS :=     --define 'packager PlanetLab'
+ALL += libvirt-python
+IN_NODEREPO += libvirt-python
+IN_NODEIMAGE += libvirt-python
+endif
+
 #
 # DistributedRateLimiting
 #