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
taking sliver-openvswitch out of fedora29
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
6d2313f
..
4832a29
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
@@
-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),f2
2
)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f2
1 f22 f23 f24 f25 f27 f29
)"
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 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
@@
-268,6
+268,9
@@
bind_public-SPEC := bind_public.spec
IN_SLICEIMAGE += bind_public
ALL += bind_public
IN_SLICEIMAGE += bind_public
ALL += bind_public
+# in fedora 29, this triggers nasty-looking compile messages
+# not trying too hard, we're mostly after the server-side of f29
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)"
#
# sliver-openvswitch
#
#
# sliver-openvswitch
#
@@
-275,6
+278,7
@@
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
+endif
#
# plcapi
#
# plcapi
@@
-312,6
+316,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
@@
-385,6
+391,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
#
@@
-392,6
+399,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