diff options
| author |   Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> | 2015-04-18 17:59:37 +0300 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-24 15:11:25 +0200 |
| commit | 43ece2557f2fe620568fc194cbd4403daa8dc00e (patch) | |
| tree | ecfa0259d1ce051adfa56033237477f69bb800da | |
| parent | 4429a3250f8a993fcce55eab44a9b3d413ab86c0 (diff) | |
| download | meta-openembedded-43ece2557f2fe620568fc194cbd4403daa8dc00e.tar.gz | |
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 <dmitry_eremin@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/conf/distro/include/meta_oe_security_flags.inc | 7 | ||||
| -rw-r--r-- | meta-oe/conf/layer.conf | 3 |
2 files changed, 10 insertions, 0 deletions
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 |