X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=77858afda2957438b41ecce7c8956f3b80bec15b;hb=62e3bd69331e110fde9aac2d0808b4f8414b9083;hp=6d2313f86481fcc5ef0b711e3c7f159cdcce6e61;hpb=c9b9797dab7a4ff39402b3ac3dc2000c24ba9bee;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 6d2313f8..77858afd 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -31,7 +31,7 @@ IN_NODEIMAGE += transforward
 # procprotect: root context module for protecting against weaknesses in /proc
 #
 ### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27)"
 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
@@ -43,7 +43,7 @@ endif
 #
 ### starting August 2015, ipfw module won't build against fedora22
 # that comes with kernel 4.1.4
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f22)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24 f25 f27)"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -130,7 +130,7 @@ IN_NODEIMAGE += codemux
 # fprobe-ulog
 #
 # xxx temporarily turning this off on f20 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27)"
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
@@ -385,6 +385,7 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27)"
 #
 # OML measurement library
 #
@@ -392,6 +393,7 @@ oml-MODULES := oml
 oml-STOCK-DEVEL-RPMS += sqlite-devel 
 oml-SPEC := liboml.spec
 ALL += oml
+endif
 
 #
 # bootcd