X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=bc1a16d7e0a6944e2a089a3cf5c24e4d7b6cfde6;hb=14bb43a97e0eab101d28feba19d836a4868cf185;hp=1443d25ca26fed41356df8f53c773bf9274e3090;hpb=d0338afbbe5e53064a2373816fcc53c7fb1ad674;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 1443d25c..bc1a16d7 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -10,8 +10,8 @@
 
 
 
-### starting with f31 : server-side-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)"
+### starting with f31 : serverside-only
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 ###
 
 
@@ -32,7 +32,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 f31 f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -149,7 +149,7 @@ ALL += pf2slice
 #                                ^^^
 #Error: This expression has type string but an expression was expected of type bytes
 #
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33 f35)"
 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
@@ -188,8 +188,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 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)"
+# not trying too hard, we're mostly after the serverside of f29 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 #
 # sliver-openvswitch
 #
@@ -201,9 +201,9 @@ endif
 
 
 
-### server-side-only
+### serverside-only
 endif
-### server-side-only
+### serverside-only
 
 
 
@@ -251,7 +251,7 @@ IN_MYPLC += www-register-wizard
 # stdsoap2.cpp:8259:18: error: narrowing conversion of ‘2147483708’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
 #  8259 |       case '<' | 0x80000000:
 #       |                  ^~~~~~~~~~
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33 f35)"
 pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
@@ -267,9 +267,9 @@ endif
 #IN_NODEIMAGE += monitor
 
 
-### server-side-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)"
-### server-side-only
+### serverside-only
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+### serverside-only
 
 
 #
@@ -394,9 +394,9 @@ slicerepo-RPMDATE := yes
 ALL += slicerepo
 
 
-### server-side-only
+### serverside-only
 endif
-### server-side-only
+### serverside-only
 
 
 #
@@ -429,9 +429,15 @@ ALL += release
 # 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)"
+# 2022 apr 28:
+# we currently run on r2labapi.inria.fr a hybrid f33/f34/f35
+# that has python2 (recipe from f33) + php-7.4 (from f34) and httpd-2.4.53 (from f35)
+# and we'll hold to that until end of june 2022
+# however the python2 ecosystem is too far-fetched now
+# so we're dropping for good support for sfa, last version is f33
+#
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
-#endif
+endif