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
bootcd with NetworkManager starting with f29
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
a519310
..
1ba12c7
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-5,7
+5,7
@@
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# see doc in Makefile
+# see doc in Makefile
#
### the madwifi drivers ship with fedora16's kernel rpm
#
### the madwifi drivers ship with fedora16's kernel rpm
@@
-18,21
+18,25
@@
lxc-userspace-SPEC := lxc-userspace.spec
ALL += lxc-userspace
IN_NODEIMAGE += lxc-userspace
ALL += lxc-userspace
IN_NODEIMAGE += lxc-userspace
-#
#
# transforward: root context module for transparent port forwarding
#
#
# transforward: root context module for transparent port forwarding
#
+# with 4.19, the jprobe api has gone entirely
+# https://github.com/torvalds/linux/commit/4de58696de076d9bd2745d1cbe0930635c3f5ac9
+#
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)"
+#
transforward-MODULES := transforward
transforward-SPEC := transforward.spec
ALL += transforward
IN_NODEIMAGE += transforward
transforward-MODULES := transforward
transforward-SPEC := transforward.spec
ALL += transforward
IN_NODEIMAGE += transforward
+endif
#
# 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
+46,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
@@
-53,7
+61,7
@@
ALL += ipfwslice
#
# comgt - a companion to umts tools
#
# comgt - a companion to umts tools
-#
+#
comgt-MODULES := comgt
comgt-SPEC := comgt.spec
IN_NODEIMAGE += comgt
comgt-MODULES := comgt
comgt-SPEC := comgt.spec
IN_NODEIMAGE += comgt
@@
-93,7
+101,7
@@
IN_NODEIMAGE += ipod
#
# plnode-utils
#
# plnode-utils
-#
+#
plnode-utils-MODULES := plnode-utils
plnode-utils-SPEC := plnode-utils-lxc.spec
ALL += plnode-utils
plnode-utils-MODULES := plnode-utils
plnode-utils-SPEC := plnode-utils-lxc.spec
ALL += plnode-utils
@@
-126,8
+134,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
+143,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
@@
-151,13
+159,13
@@
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
# The --without options are breaking spec2make : hard-wired in the specfile instead
libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
libvirt-BUILD-FROM-SRPM := yes
# The --without options are breaking spec2make : hard-wired in the specfile instead
libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
-libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
-libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
-libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
+libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
+libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
# for 1.2.1 - first seen on f20, not sure for the other ones
libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
# for 1.2.1 - first seen on f20, not sure for the other ones
libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
-libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
+libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
@@
-166,13
+174,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
+197,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
+260,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
+273,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), f29)"
#
# sliver-openvswitch
#
#
# sliver-openvswitch
#
@@
-279,6
+283,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
@@
-290,7
+295,7
@@
IN_MYPLC += plcapi
#
# drupal
#
# drupal
-#
+#
drupal-MODULES := drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
drupal-MODULES := drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
@@
-316,6
+321,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
@@
-347,15
+354,6
@@
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
endif
ALL += pyopenssl
endif
-#
-# pyaspects
-#
-pyaspects-MODULES := pyaspects
-pyaspects-SPEC := pyaspects.spec
-pyaspects-BUILD-FROM-SRPM := yes
-ALL += pyaspects
-
-#
# nodeconfig
#
nodeconfig-MODULES := nodeconfig
# nodeconfig
#
nodeconfig-MODULES := nodeconfig
@@
-373,7
+371,7
@@
IN_MYPLC += bootmanager
#
# pypcilib : used in bootcd
#
# pypcilib : used in bootcd
-#
+#
pypcilib-MODULES := pypcilib
pypcilib-SPEC := pypcilib.spec
ALL += pypcilib
pypcilib-MODULES := pypcilib
pypcilib-SPEC := pypcilib.spec
ALL += pypcilib
@@
-389,13
+387,15
@@
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-MODULES := oml
#
# OML measurement library
#
oml-MODULES := oml
-oml-STOCK-DEVEL-RPMS += sqlite-devel
+oml-STOCK-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
oml-SPEC := liboml.spec
ALL += oml
+endif
#
# bootcd
#
# bootcd
@@
-421,7
+421,7
@@
IN_NODEIMAGE += sliceimage
#
# lxc-specific sliceimage initialization
#
# lxc-specific sliceimage initialization
-#
+#
lxc-sliceimage-MODULES := sliceimage
lxc-sliceimage-SPEC := lxc-sliceimage.spec
lxc-sliceimage-RPMDATE := yes
lxc-sliceimage-MODULES := sliceimage
lxc-sliceimage-SPEC := lxc-sliceimage.spec
lxc-sliceimage-RPMDATE := yes
@@
-487,7
+487,7
@@
myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
-# we still need to pull MyPLC, as it is where the specfile lies,
+# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
# together with the utility script docbook2drupal.sh
myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec