From 43ece2557f2fe620568fc194cbd4403daa8dc00e Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sat, 18 Apr 2015 17:59:37 +0300 Subject: meta-oe: 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: Martin Jansa --- meta-oe/conf/distro/include/meta_oe_security_flags.inc | 7 +++++++ meta-oe/conf/layer.conf | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 meta-oe/conf/distro/include/meta_oe_security_flags.inc (limited to 'meta-oe/conf') diff --git a/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/meta-oe/conf/distro/include/meta_oe_security_flags.inc new file mode 100644 index 0000000000..2565e32adf --- /dev/null +++ b/meta-oe/conf/distro/include/meta_oe_security_flags.inc @@ -0,0 +1,7 @@ +# Build errors with the pie options enabled +SECURITY_CFLAGS_pn-lvm2 = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-rrdtool = "${SECURITY_NO_PIE_CFLAGS}" + +# This has text reloc errors with the pie options enabled +SECURITY_CFLAGS_pn-mozjs = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-openldap = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index e2a89cdae9..7af9b3dd7e 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -44,3 +44,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " FREESMARTPHONE_GIT = "git://git.freesmartphone.org" + +# Override security flags +require conf/distro/include/meta_oe_security_flags.inc -- cgit 1.2.3-korg