X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=1443d25ca26fed41356df8f53c773bf9274e3090;hb=b788b76660e049c3e0b93b15cd0c856316c1d0a2;hp=f833283189cdc5588af2d659ab0891afe7f515cb;hpb=1f4f80e0c7dc71ef79614227c195139a56d1421e;p=build.git diff --git a/lxc.mk b/lxc.mk index f8332831..1443d25c 100644 --- a/lxc.mk +++ b/lxc.mk @@ -8,6 +8,14 @@ # see doc in Makefile # + + +### starting with f31 : server-side-only +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)" +### + + + ### 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 f31)" +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)" # 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)" 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 @@ -172,7 +189,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 and above -ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)" +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)" # # sliver-openvswitch # @@ -182,6 +199,15 @@ IN_SLICEIMAGE += sliver-openvswitch ALL += sliver-openvswitch endif + + +### server-side-only +endif +### server-side-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)" pcucontrol-MODULES := pcucontrol pcucontrol-SPEC := pcucontrol.spec ALL += pcucontrol +endif # # monitor @@ -233,6 +266,12 @@ ALL += pcucontrol #ALL += monitor #IN_NODEIMAGE += monitor + +### server-side-only +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)" +### server-side-only + + # # PLC RT # @@ -354,6 +393,12 @@ slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS) slicerepo-RPMDATE := yes ALL += slicerepo + +### server-side-only +endif +### server-side-only + + # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver #