X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=563590c4fd5105816080db27ede7382217161371;hb=cc5a9338d1528a7fec60f496bfba7b8b28a80539;hp=65487235878c71e796d784362f35f2c8610221d2;hpb=febc6d77dc41b0e4811f1ae11372be6ce6d74ad0;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 65487235..563590c4 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -18,14 +18,19 @@ 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)"
+#
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
 ALL += transforward
 IN_NODEIMAGE += transforward
+endif
 
 #
 # procprotect: root context module for protecting against weaknesses in /proc
@@ -270,7 +275,7 @@ 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)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)"
 #
 # sliver-openvswitch
 #
@@ -349,15 +354,6 @@ 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
@@ -507,6 +503,13 @@ 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
+#
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29)"
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
+endif