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
module-tools & git clone : specify --depth only when necessary
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
f852ab8
..
a519310
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-30,10
+30,14
@@
IN_NODEIMAGE += transforward
#
# procprotect: root context module for protecting against weaknesses in /proc
#
#
# procprotect: root context module for protecting against weaknesses in /proc
#
+### an attempt to remove procprotect from the nodes on f21 now that it has 3.19
+# xxx if that works then we should also tweak nodeimage.pkgs accordingly
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
procprotect-MODULES := procprotect
procprotect-SPEC := procprotect.spec
ALL += procprotect
IN_NODEIMAGE += procprotect
procprotect-MODULES := procprotect
procprotect-SPEC := procprotect.spec
ALL += procprotect
IN_NODEIMAGE += procprotect
+endif
#
# ipfw: root context module, and slice companion
#
# ipfw: root context module, and slice companion
@@
-122,11
+126,13
@@
IN_NODEIMAGE += codemux
#
# fprobe-ulog
#
#
# fprobe-ulog
#
-# xxx temporarily turning this off
+# xxx temporarily turning this off on f20 and f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
-#ALL += fprobe-ulog
-#IN_NODEIMAGE += fprobe-ulog
+ALL += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
+endif
#################### libvirt version selection
# settling with using version 1.2.1 on all fedoras
#################### libvirt version selection
# settling with using version 1.2.1 on all fedoras
@@
-155,6
+161,7
@@
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
# 1.2.11
libvirt-STOCK-DEVEL-RPMS += wireshark-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
@@
-249,10
+256,13
@@
vsys-scripts-SPEC := root-context/vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+# xxx temporarily turning this off on f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
vsys-wrapper-MODULES := vsys-scripts
vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
IN_SLICEIMAGE += vsys-wrapper
ALL += vsys-wrapper
vsys-wrapper-MODULES := vsys-scripts
vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
IN_SLICEIMAGE += vsys-wrapper
ALL += vsys-wrapper
+endif
#
# bind_public
#
# bind_public