From f23b69928351afa165ad7c25b8cc88c2a661a09e Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Fri, 17 Apr 2015 16:41:02 +0300 Subject: [PATCH] conf: override SECURITY_CFLAGS for a set of recipes Some of recipes produce errors if the distro has enabled usage of security_flags.inc file. Fix those errors (and QA warnings) by providing an additional include file that is require'd from conf/layer.conf. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Bruce Ashfield --- conf/distro/include/virt_security_flags.inc | 5 +++++ conf/layer.conf | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 conf/distro/include/virt_security_flags.inc diff --git a/conf/distro/include/virt_security_flags.inc b/conf/distro/include/virt_security_flags.inc new file mode 100644 index 00000000..f4c288b8 --- /dev/null +++ b/conf/distro/include/virt_security_flags.inc @@ -0,0 +1,5 @@ +# Build errors with the pie options enabled +SECURITY_CFLAGS_pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}" + +# This has text relco errors with the pie options enabled +SECURITY_CFLAGS_pn-lxc = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/conf/layer.conf b/conf/layer.conf index 7ae9d093..f5c1b1ec 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -16,3 +16,6 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" LAYERVERSION_virtualization-layer = "1" LAYERDEPENDS_virtualization-layer = "core networking-layer" + +# Override security flags +require conf/distro/include/virt_security_flags.inc