git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build module no longer is a dependency of a real module, but tests need it
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
5cb8194
..
1443d25
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-8,6
+8,14
@@
# see doc in Makefile
#
# 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
#
### 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
#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
ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
@@
-191,6
+199,15
@@
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
endif
ALL += sliver-openvswitch
endif
+
+
+### server-side-only
+endif
+### server-side-only
+
+
+
+
#
# plcapi
#
#
# plcapi
#
@@
-249,6
+266,12
@@
endif
#ALL += monitor
#IN_NODEIMAGE += monitor
#ALL += monitor
#IN_NODEIMAGE += monitor
+
+### server-side-only
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)"
+### server-side-only
+
+
#
# PLC RT
#
#
# PLC RT
#
@@
-370,6
+393,12
@@
slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
slicerepo-RPMDATE := yes
ALL += slicerepo
slicerepo-RPMDATE := yes
ALL += slicerepo
+
+### server-side-only
+endif
+### server-side-only
+
+
#
# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
#
#
# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
#