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

diff --git a/lxc.mk b/lxc.mk
index 6bb9ba30..f8332831 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -5,55 +5,66 @@
 # 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 ahip with fedora16's kernel rpm
+### the madwifi drivers ship with fedora16's kernel rpm
 
 #
-# lxctools: scripts for entering containers
+# lxc-userspace: scripts for entering containers
 #
-lxctools-MODULES := lxctools
-lxctools-SPEC := lxctools.spec
-ALL += lxctools
-IN_NODEIMAGE += lxctools
+lxc-userspace-MODULES := lxc-userspace
+lxc-userspace-SPEC := lxc-userspace.spec
+ALL += lxc-userspace
+IN_NODEIMAGE += lxc-userspace
 
 #
-# lxcsu: root context module for entering namespaces
+# transforward: root context module for transparent port forwarding
 #
-lxcsu-MODULES := lxcsu
-lxcsu-SPEC := lxcsu.spec
-ALL += lxcsu
-IN_NODEIMAGE += lxcsu
-
+# with 4.19, the jprobe api has gone entirely
+# https://github.com/torvalds/linux/commit/4de58696de076d9bd2745d1cbe0930635c3f5ac9
 #
-#
-# transforward: root context module for transparent port forwarding
+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
 #
-procprotect-MODULES := procprotect
-procprotect-SPEC := procprotect.spec
-ALL += procprotect
-IN_NODEIMAGE += procprotect
 
 #
 # ipfw: root context module, and slice companion
+# has gone since f21
 #
-ipfwroot-MODULES := ipfw
-ipfwroot-SPEC := planetlab/ipfwroot.spec
-ALL += ipfwroot
-IN_NODEIMAGE += ipfwroot
 
-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
+ALL += comgt
+
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_NODEIMAGE += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_SLICEIMAGE += umts-frontend
+ALL += umts-frontend
 
 #
 # NodeUpdate
@@ -73,7 +84,7 @@ IN_NODEIMAGE += ipod
 
 #
 # plnode-utils
-# 
+#
 plnode-utils-MODULES := plnode-utils
 plnode-utils-SPEC := plnode-utils-lxc.spec
 ALL += plnode-utils
@@ -82,15 +93,10 @@ IN_NODEIMAGE += plnode-utils
 #
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-lxc-MODULES := nodemanager
-nodemanager-lxc-SPEC := nodemanager-lxc.spec
-ALL += nodemanager-lxc
-IN_NODEIMAGE += nodemanager-lxc
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -110,49 +116,13 @@ IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
+# has gone since f20
 #
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_NODEIMAGE += fprobe-ulog
-
-#################### libvirt on f16 is too old, sounds like f17 has something fine
-local_libvirt=false
-ifeq "$(DISTRONAME)" "f16"
-local_libvirt=true
-endif
-
-ifeq "$(local_libvirt)" "true"
-#
-# libvirt
-#
-libvirt-MODULES := libvirt
-libvirt-SPEC    := libvirt.spec
-libvirt-BUILD-FROM-SRPM := yes
-libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext 
-libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
-libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
-libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel
-# The --without options are breaking spec2make
-#libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
-#	                --without storage-fs --without storage-lvm \
-#	                --without polkit --without sasl --without audit --with capng --with udev \
-#	                --without netcf --without avahi --without sanlock \
-#	                --without xen --without qemu --without hyperv --without phyp --without esx \
-#	                --without libxl \
-libvirt-RPMFLAGS :=	--define 'packager PlanetLab'
-ALL += libvirt
-IN_NODEREPO += libvirt
-IN_NODEIMAGE += libvirt
-endif
 
 #
-# 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
@@ -161,57 +131,13 @@ 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
-
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see yumexclude
-#
-local_inotify_tools=false
-ifeq "$(DISTRONAME)" "centos5"
-local_inotify_tools=true
-endif
-
-ifeq "$(DISTRONAME)" "sl6"
-local_inotify_tools=true
-endif
-
-ifeq "$(local_inotify_tools)" "true"
-inotify-tools-MODULES := inotify-tools
-inotify-tools-SPEC := inotify-tools.spec
-inotify-tools-BUILD-FROM-SRPM := yes
-IN_NODEIMAGE += inotify-tools
-ALL += inotify-tools
-endif
-
-#
-# openvswitch
-#
-# openvswitch-MODULES := openvswitch
-# openvswitch-SPEC := openvswitch.spec
-# openvswitch-DEPEND-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
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
-ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
-endif
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 IN_NODEIMAGE += vsys
 ALL += vsys
 
@@ -231,6 +157,11 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
 #
 # bind_public
 #
@@ -239,17 +170,29 @@ 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
+#
+sliver-openvswitch-MODULES := sliver-openvswitch
+sliver-openvswitch-SPEC := sliver-openvswitch.spec
+IN_SLICEIMAGE += sliver-openvswitch
+ALL += sliver-openvswitch
+endif
+
 #
 # plcapi
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi
 
 #
 # drupal
-# 
+#
 drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
@@ -275,6 +218,8 @@ IN_MYPLC += www-register-wizard
 #
 # 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
@@ -284,7 +229,7 @@ ALL += pcucontrol
 #
 #monitor-MODULES := monitor
 #monitor-SPEC := Monitor.spec
-#monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+#monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 #ALL += monitor
 #IN_NODEIMAGE += monitor
 
@@ -295,46 +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
-
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
-endif
-
-#
 # nodeconfig
 #
 nodeconfig-MODULES := nodeconfig
@@ -352,7 +257,7 @@ IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
-# 
+#
 pypcilib-MODULES := pypcilib
 pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
@@ -368,21 +273,6 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-#
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_SLICEIMAGE += omf-resctl
-
-#
-# OMF exp controller
-#
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
-
 #
 # bootcd
 #
@@ -407,7 +297,7 @@ IN_NODEIMAGE += sliceimage
 
 #
 # lxc-specific sliceimage initialization
-# 
+#
 lxc-sliceimage-MODULES	:= sliceimage
 lxc-sliceimage-SPEC	:= lxc-sliceimage.spec
 lxc-sliceimage-RPMDATE	:= yes
@@ -473,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
@@ -484,3 +374,19 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 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