turn off ipfw on f21 too

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 621faca..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
@@ -136,7 +140,7 @@ endif
 #################### libvirt version selection
 
 # use fedora's libvirt starting with f22
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
 local_libvirt=true
 endif