git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6e3a48
)
keep f23 away from procprotext ipfwroot fprobe-ulog
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 4 Nov 2015 11:32:02 +0000
(12:32 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 4 Nov 2015 11:32:02 +0000
(12:32 +0100)
lxc.mk
patch
|
blob
|
history
diff --git
a/lxc.mk
b/lxc.mk
index
6a115f6
..
c911c1f
100644
(file)
--- 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
# 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
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
#
### 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
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
# 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
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog