X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=bc1a16d7e0a6944e2a089a3cf5c24e4d7b6cfde6;hb=148d8b4df137f13bc49c77a4fa047c43f2d2d9f5;hp=b538966e680f419789c247af76dac05b716ea8c0;hpb=aad42eb2e61f424e16fd2a2dff26a2c80e866f84;p=build.git

diff --git a/lxc.mk b/lxc.mk
index b538966e..bc1a16d7 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -8,6 +8,14 @@
 # see doc in Makefile
 #
 
+
+
+### starting with f31 : serverside-only
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+###
+
+
+
 ### the madwifi drivers ship with fedora16's kernel rpm
 
 #
@@ -24,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)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -134,12 +142,21 @@ ALL += pf2slice
 #
 # vsys
 #
+# dropped in f33:
+#ocamlopt  -c -o inotify.cmx inotify.ml
+#File "inotify.ml", line 95, characters 27-30:
+#95 |    let toread = Unix.read fd buf 0 toread in
+#                                ^^^
+#Error: This expression has type string but an expression was expected of type bytes
+#
+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
 vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 IN_NODEIMAGE += vsys
 ALL += vsys
+endif
 
 #
 # vsyssh : installed in slivers
@@ -171,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
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)"
+# not trying too hard, we're mostly after the serverside of f29 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 #
 # sliver-openvswitch
 #
@@ -182,6 +199,15 @@ IN_SLICEIMAGE += sliver-openvswitch
 ALL += sliver-openvswitch
 endif
 
+
+
+### serverside-only
+endif
+### serverside-only
+
+
+
+
 #
 # plcapi
 #
@@ -220,9 +246,16 @@ IN_MYPLC += www-register-wizard
 #
 # WARNING: as of f27 I have to remove support for SSL in pcucontrol
 # see pcucontrol.spec for details
+# no longer builds in f33
+# stdsoap2.cpp: In function ‘char* soap_string_in(soap*, int, long int, long int)’:
+# stdsoap2.cpp:8259:18: error: narrowing conversion of ‘2147483708’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
+#  8259 |       case '<' | 0x80000000:
+#       |                  ^~~~~~~~~~
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33 f35)"
 pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
+endif
 
 #
 # monitor
@@ -233,6 +266,12 @@ ALL += pcucontrol
 #ALL += monitor
 #IN_NODEIMAGE += monitor
 
+
+### serverside-only
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+### serverside-only
+
+
 #
 # PLC RT
 #
@@ -354,6 +393,12 @@ slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
 slicerepo-RPMDATE := yes
 ALL += slicerepo
 
+
+### serverside-only
+endif
+### serverside-only
+
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
@@ -383,8 +428,15 @@ 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
-#
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29)"
+# 2019 mar 27: reinstating for hopefully connecting fed4fire
+# 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