From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 20 Jun 2015 14:43:43 +0000 (+0200)
Subject: use stock libvirt starting with fedora22
X-Git-Tag: 5.3.9~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c3014af93058cb939fa5582a5d3462e5e6d8b5c8;p=build.git

use stock libvirt starting with fedora22
---

diff --git a/lxc.mk b/lxc.mk
index 391653be..621faca2 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -134,11 +134,11 @@ IN_NODEIMAGE += fprobe-ulog
 endif
 
 #################### 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
 
+# use fedora's libvirt starting with f22
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
 local_libvirt=true
-separate_libvirt_python=true
+endif
 
 #
 # libvirt
@@ -165,13 +165,9 @@ ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
 
-endif
-
 #
 ## libvirt-python
 #
-ifeq "$(separate_libvirt_python)" "true"
-
 libvirt-python-MODULES := libvirt-python
 libvirt-python-SPEC    := libvirt-python.spec
 libvirt-python-BUILD-FROM-SRPM := yes
@@ -192,7 +188,7 @@ ALL += libvirt-python
 IN_NODEREPO += libvirt-python
 IN_NODEIMAGE += libvirt-python
 
-endif
+endif # local_libvirt
 
 #
 # DistributedRateLimiting