X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=1443d25ca26fed41356df8f53c773bf9274e3090;hb=d0338afbbe5e53064a2373816fcc53c7fb1ad674;hp=37ccb99f94e3d4acbd1c1aa209a80c596ca7eabe;hpb=9cacaa82faea5f03bd497c786e88ba1b996e221a;p=build.git diff --git a/lxc.mk b/lxc.mk index 37ccb99f..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 # @@ -140,7 +148,7 @@ ALL += pf2slice #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 @@ -191,6 +199,15 @@ IN_SLICEIMAGE += sliver-openvswitch ALL += sliver-openvswitch endif + + +### server-side-only +endif +### server-side-only + + + + # # plcapi # @@ -229,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 @@ -242,6 +266,12 @@ ALL += pcucontrol #ALL += monitor #IN_NODEIMAGE += monitor + +### server-side-only +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)" +### server-side-only + + # # PLC RT # @@ -363,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 #