dhclient name change in f22 needed in nodeimage.pkgs as well - although probably...

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 391653b..6a115f6 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -41,10 +41,14 @@ endif
 #
 # ipfw: root context module, and slice companion
 #
+### starting August 2015, ipfw module won't build against fedora22
+# that comes with kernel 4.1.4
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22)"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
 IN_NODEIMAGE += ipfwroot
+endif
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -134,11 +138,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
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
 local_libvirt=true
-separate_libvirt_python=true
+endif
 
 #
 # libvirt
@@ -165,13 +169,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 +192,7 @@ ALL += libvirt-python
 IN_NODEREPO += libvirt-python
 IN_NODEIMAGE += libvirt-python
 
-endif
+endif # local_libvirt
 
 #
 # DistributedRateLimiting