git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pkgs.py runs on python3
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
621faca
..
07aa552
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 f24 f25 f27 f29
)"
procprotect-MODULES := procprotect
procprotect-SPEC := procprotect.spec
ALL += procprotect
procprotect-MODULES := procprotect
procprotect-SPEC := procprotect.spec
ALL += procprotect
@@
-41,10
+41,14
@@
endif
#
# ipfw: root context module, and slice companion
#
#
# 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 f23 f24 f25 f27 f29)"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
IN_NODEIMAGE += ipfwroot
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
IN_NODEIMAGE += ipfwroot
+endif
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
@@
-126,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 f24 f25 f27 f29
)"
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
@@
-136,7
+140,7
@@
endif
#################### libvirt version selection
# use fedora's libvirt starting with f22
#################### libvirt version selection
# use fedora's libvirt starting with f22
-if
n
eq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
local_libvirt=true
endif
local_libvirt=true
endif
@@
-308,6
+312,8
@@
IN_MYPLC += www-register-wizard
#
# pcucontrol
#
#
# pcucontrol
#
+# WARNING: as of f27 I have to remove support for SSL in pcucontrol
+# see pcucontrol.spec for details
pcucontrol-MODULES := pcucontrol
pcucontrol-SPEC := pcucontrol.spec
ALL += pcucontrol
pcucontrol-MODULES := pcucontrol
pcucontrol-SPEC := pcucontrol.spec
ALL += pcucontrol
@@
-381,6
+387,7
@@
IN_NODEIMAGE += pyplnet
IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)"
#
# OML measurement library
#
#
# OML measurement library
#
@@
-388,6
+395,7
@@
oml-MODULES := oml
oml-STOCK-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
oml-STOCK-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
+endif
#
# bootcd
#
# bootcd