X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=37ccb99f94e3d4acbd1c1aa209a80c596ca7eabe;hb=9cacaa82faea5f03bd497c786e88ba1b996e221a;hp=0554e31c445c6b6164ff4ce60704fbec611ed0bd;hpb=e4d37ed50c2ee479d85f7007c77037c05a647664;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 0554e31c..37ccb99f 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 f33)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -134,12 +134,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)"
 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 +180,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 f33)"
 #
 # sliver-openvswitch
 #
@@ -385,7 +394,7 @@ ALL += release
 # 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