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
a519310
..
4832a29
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-30,9
+30,8
@@
IN_NODEIMAGE += transforward
#
# procprotect: root context module for protecting against weaknesses in /proc
#
#
# procprotect: root context module for protecting against weaknesses in /proc
#
-### an attempt to remove procprotect from the nodes on f21 now that it has 3.19
-# xxx if that works then we should also tweak nodeimage.pkgs accordingly
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
+### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
+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
@@
-42,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,8
+129,8
@@
IN_NODEIMAGE += codemux
#
# fprobe-ulog
#
#
# fprobe-ulog
#
-# xxx temporarily turning this off on f20 and
f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
+# xxx temporarily turning this off on f20 and
above
+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
@@
-135,11
+138,11
@@
IN_NODEIMAGE += fprobe-ulog
endif
#################### libvirt version selection
endif
#################### libvirt version selection
-# settling with using version 1.2.1 on all fedoras
-# although this does not solve the slice re-creation issue seen on f20
+# use fedora's libvirt starting with f22
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
local_libvirt=true
local_libvirt=true
-separate_libvirt_python=true
+endif
#
# libvirt
#
# libvirt
@@
-166,13
+169,9
@@
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
-endif
-
#
## libvirt-python
#
#
## libvirt-python
#
-ifeq "$(separate_libvirt_python)" "true"
-
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
@@
-193,7
+192,7
@@
ALL += libvirt-python
IN_NODEREPO += libvirt-python
IN_NODEIMAGE += libvirt-python
IN_NODEREPO += libvirt-python
IN_NODEIMAGE += libvirt-python
-endif
+endif
# local_libvirt
#
# DistributedRateLimiting
#
# DistributedRateLimiting
@@
-256,13
+255,10
@@
vsys-scripts-SPEC := root-context/vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
-# xxx temporarily turning this off on f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
vsys-wrapper-MODULES := vsys-scripts
vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
IN_SLICEIMAGE += vsys-wrapper
ALL += vsys-wrapper
vsys-wrapper-MODULES := vsys-scripts
vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
IN_SLICEIMAGE += vsys-wrapper
ALL += vsys-wrapper
-endif
#
# bind_public
#
# bind_public
@@
-272,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
#
@@
-279,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
@@
-316,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
@@
-389,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
#
@@
-396,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