X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=lxc.mk;h=f833283189cdc5588af2d659ab0891afe7f515cb;hp=5a238de55d2e8602d7d127df9dbe12d66f4f7284;hb=1f4f80e0c7dc71ef79614227c195139a56d1421e;hpb=6bbdfbecded67a8c30a1fe8d5f6e65d8259aee8e

diff --git a/lxc.mk b/lxc.mk
index 5a238de5..f8332831 100644
--- 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
 #
-# see doc in Makefile  
+# see doc in Makefile
 #
 
 ### the madwifi drivers ship with fedora16's kernel rpm
@@ -18,45 +18,33 @@ lxc-userspace-SPEC := lxc-userspace.spec
 ALL += lxc-userspace
 IN_NODEIMAGE += lxc-userspace
 
-#
 #
 # 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 f31)"
+#
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
 ALL += transforward
 IN_NODEIMAGE += transforward
+endif
 
 #
 # procprotect: root context module for protecting against weaknesses in /proc
+# has gone since f20
 #
-### 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)"
-procprotect-MODULES := procprotect
-procprotect-SPEC := procprotect.spec
-ALL += procprotect
-IN_NODEIMAGE += procprotect
-endif
 
 #
 # ipfw: root context module, and slice companion
+# has gone since f21
 #
-### 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)"
-ipfwroot-MODULES := ipfw
-ipfwroot-SPEC := planetlab/ipfwroot.spec
-ALL += ipfwroot
-IN_NODEIMAGE += ipfwroot
-endif
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := planetlab/ipfwslice.spec
-ALL += ipfwslice
 
 #
 # comgt - a companion to umts tools
-# 
+#
 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
 IN_NODEIMAGE += comgt
@@ -96,7 +84,7 @@ IN_NODEIMAGE += ipod
 
 #
 # plnode-utils
-# 
+#
 plnode-utils-MODULES := plnode-utils
 plnode-utils-SPEC := plnode-utils-lxc.spec
 ALL += plnode-utils
@@ -128,79 +116,13 @@ IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
+# has gone since f20
 #
-# xxx temporarily turning this off on f20 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27)"
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_NODEIMAGE += fprobe-ulog
-endif
-
-#################### libvirt version selection
-
-# use fedora's libvirt starting with f22
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
-local_libvirt=true
-endif
-
-#
-# libvirt
-#
-ifeq "$(local_libvirt)" "true"
-
-libvirt-MODULES := libvirt
-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-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
-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 += ceph-devel-compat
-ALL += libvirt
-IN_NODEREPO += libvirt
-IN_NODEIMAGE += libvirt
-
-#
-## libvirt-python
-#
-libvirt-python-MODULES := libvirt-python
-libvirt-python-SPEC    := libvirt-python.spec
-libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += pm-utils
-# for 1.2.11
-libvirt-python-STOCK-DEVEL-RPMS += python-nose
-# it would make sense to do something like this if we wanted to
-# build against python3 as well, but for now I turned this feature off
-# in libvirt-python
-#ifeq "$(distro)" "Fedora"
-#xxx if $(distrorelease) > 18
-#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml
-#endif
-#endif
-libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
-libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
-ALL += libvirt-python
-IN_NODEREPO += libvirt-python
-IN_NODEIMAGE += libvirt-python
-
-endif # local_libvirt
 
 #
-# DistributedRateLimiting
+# our own brew of libvirt
+# is no longer needed since f22
 #
-#DistributedRateLimiting-MODULES := DistributedRateLimiting
-#DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-#ALL += DistributedRateLimiting
-#IN_NODEREPO += DistributedRateLimiting
 
 #
 # pf2slice
@@ -209,26 +131,6 @@ pf2slice-MODULES := pf2slice
 pf2slice-SPEC := pf2slice.spec
 ALL += pf2slice
 
-##
-## PlanetLab Mom: Cleans up your mess
-##
-#mom-MODULES := mom
-#mom-SPEC := pl_mom.spec
-#ALL += mom
-#IN_NODEIMAGE += mom
-
-#
-# openvswitch
-#
-# openvswitch-MODULES := openvswitch
-# openvswitch-SPEC := openvswitch.spec
-# openvswitch-STOCK-DEVEL-RPMS += kernel-devel
-# IN_NODEIMAGE += openvswitch
-# # build only on f14 as f16 has this natively
-# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
-# ALL += openvswitch
-# endif
-
 #
 # vsys
 #
@@ -268,6 +170,9 @@ bind_public-SPEC := bind_public.spec
 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 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)"
 #
 # sliver-openvswitch
 #
@@ -275,6 +180,7 @@ sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 IN_SLICEIMAGE += sliver-openvswitch
 ALL += sliver-openvswitch
+endif
 
 #
 # plcapi
@@ -286,7 +192,7 @@ IN_MYPLC += plcapi
 
 #
 # drupal
-# 
+#
 drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
@@ -334,26 +240,6 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
-# f12 has 0.9-1 already
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-#
-# pyopenssl
-#
-pyopenssl-MODULES := pyopenssl
-pyopenssl-SPEC := pyOpenSSL.spec
-pyopenssl-BUILD-FROM-SRPM := yes
-ALL += pyopenssl
-endif
-
-#
-# pyaspects
-#
-pyaspects-MODULES := pyaspects
-pyaspects-SPEC := pyaspects.spec
-pyaspects-BUILD-FROM-SRPM := yes
-ALL += pyaspects
-
-#
 # nodeconfig
 #
 nodeconfig-MODULES := nodeconfig
@@ -371,7 +257,7 @@ IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
-# 
+#
 pypcilib-MODULES := pypcilib
 pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
@@ -387,16 +273,6 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27)"
-#
-# OML measurement library
-#
-oml-MODULES := oml
-oml-STOCK-DEVEL-RPMS += sqlite-devel 
-oml-SPEC := liboml.spec
-ALL += oml
-endif
-
 #
 # bootcd
 #
@@ -421,7 +297,7 @@ IN_NODEIMAGE += sliceimage
 
 #
 # lxc-specific sliceimage initialization
-# 
+#
 lxc-sliceimage-MODULES	:= sliceimage
 lxc-sliceimage-SPEC	:= lxc-sliceimage.spec
 lxc-sliceimage-RPMDATE	:= yes
@@ -487,7 +363,7 @@ myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 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
@@ -503,6 +379,14 @@ ALL += release
 #
 # sfa - Slice Facility Architecture
 #
+# this is python2, somehow the tests won't pass against a py3 plcapi
+# oddly enough, when the py2 sfa code issues xmlrpc calls over ssl
+# to the underlying myplc, we get SSL handshake issues
+# so, let's keep this out of the way for now
+# 2019 mar 27: reinstating for hopefully connecting fed4fire
+#
+#ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29 f31)"
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
+#endif