From: Thierry Parmentelat Date: Wed, 4 Nov 2015 11:32:02 +0000 (+0100) Subject: keep f23 away from procprotext ipfwroot fprobe-ulog X-Git-Tag: 5.3.10~20 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=83b1895c7ca444868c73ed12cc22f72c1c413cc0 keep f23 away from procprotext ipfwroot fprobe-ulog --- diff --git a/lxc.mk b/lxc.mk index 6a115f60..c911c1fc 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)" 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),f21 f22)" +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23)" 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)" fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog