X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=f833283189cdc5588af2d659ab0891afe7f515cb;hb=ccdbfde0e9cda749d790f901247f1c524177c951;hp=b538966e680f419789c247af76dac05b716ea8c0;hpb=aad42eb2e61f424e16fd2a2dff26a2c80e866f84;p=build.git diff --git a/lxc.mk b/lxc.mk index b538966e..f8332831 100644 --- a/lxc.mk +++ b/lxc.mk @@ -24,7 +24,7 @@ IN_NODEIMAGE += lxc-userspace # with 4.19, the jprobe api has gone entirely # https://github.com/torvalds/linux/commit/4de58696de076d9bd2745d1cbe0930635c3f5ac9 # -ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)" +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)" # transforward-MODULES := transforward transforward-SPEC := transforward.spec @@ -171,8 +171,8 @@ 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)" +# not trying too hard, we're mostly after the server-side of f29 and above +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)" # # sliver-openvswitch # @@ -383,9 +383,10 @@ ALL += release # 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)" +#ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29 f31)" sfa-MODULES := sfa sfa-SPEC := sfa.spec ALL += sfa -endif +#endif