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
drop support for sfa starting with f29
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
6548723
..
8c8175a
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-18,14
+18,19
@@
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
@@
-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
# 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
#
#
# sliver-openvswitch
#
@@
-349,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
@@
-507,6
+503,10
@@
ALL += release
#
# sfa - Slice Facility Architecture
#
#
# sfa - Slice Facility Architecture
#
+# this is python2, somehow the tests won't pass on f29, so let's move on
+#
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)"
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
+endif