diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-07-08 11:50:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-10 09:42:05 +0100 |
commit | 723ab4a892f59f0307599eabfff1dcbc9da80edb (patch) | |
tree | 7b02668304dfd3101bb25d7c726784950d2bc170 /meta/conf/distro | |
parent | 1d10dc3ec3242d49515c4625bd1c0b6332bff455 (diff) | |
download | poky-723ab4a892f59f0307599eabfff1dcbc9da80edb.tar.gz |
security_flags: Add addition recipes to the non pie list
Create a local SECURITY_NO_PIE_CFLAGS to cover the recipes that have
issues with with pic and pie cflags set.
(From OE-Core rev: 4f5009dcbbeb27bdf5dcaebb3b457fecef410ebe)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 72dd1ad581..2858e46c8a 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
@@ -1,26 +1,47 @@ | |||
1 | SECURITY_CFLAGS ?= "-fstack-protector-all -pie -fpie -D_FORTIFY_SOURCE=2" | 1 | SECURITY_CFLAGS ?= "-fstack-protector-all -pie -fpie -D_FORTIFY_SOURCE=2" |
2 | SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-all -D_FORTIFY_SOURCE=2" | ||
2 | SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now" | 3 | SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now" |
3 | 4 | ||
5 | SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}" | ||
6 | SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}" | ||
4 | # Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned | 7 | # Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned |
5 | # to CPPFLAGS it gets picked into CFLAGS in bitbake. | 8 | # to CPPFLAGS it gets picked into CFLAGS in bitbake. |
6 | #TARGET_CPPFLAGS_pn-curl += "-D_FORTIFY_SOURCE=2" | 9 | #TARGET_CPPFLAGS_pn-curl += "-D_FORTIFY_SOURCE=2" |
7 | SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" | 10 | SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" |
8 | SECURITY_CFLAGS_pn-ppp = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 11 | SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" |
9 | SECURITY_CFLAGS_pn-eglibc = "" | 12 | SECURITY_CFLAGS_pn-eglibc = "" |
10 | SECURITY_CFLAGS_pn-eglibc-initial = "" | 13 | SECURITY_CFLAGS_pn-eglibc-initial = "" |
11 | SECURITY_CFLAGS_pn-zlib = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 14 | SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" |
12 | SECURITY_CFLAGS_pn-gcc-runtime = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 15 | SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" |
13 | SECURITY_CFLAGS_pn-libgcc = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 16 | SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" |
14 | SECURITY_CFLAGS_pn-tcl = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 17 | SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" |
15 | SECURITY_CFLAGS_pn-libcap = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 18 | SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" |
16 | SECURITY_CFLAGS_pn-python-smartpm = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 19 | SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" |
17 | SECURITY_CFLAGS_pn-python-imaging = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 20 | SECURITY_CFLAGS_pn-grub = "" |
18 | SECURITY_CFLAGS_pn-python-pycurl = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 21 | SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" |
19 | SECURITY_CFLAGS_pn-kexec-tools = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 22 | SECURITY_CFLAGS_pn-gst-plugins-gl = "${SECURITY_NO_PIE_CFLAGS}" |
23 | SECURITY_CFLAGS_pn-gstreamer1.0-plugins-good = "${SECURITY_NO_PIE_CFLAGS}" | ||
24 | SECURITY_CFLAGS_pn-harfbuzz = "${SECURITY_NO_PIE_CFLAGS}" | ||
25 | SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" | ||
26 | SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" | ||
27 | SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" | ||
28 | SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" | ||
29 | SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" | ||
30 | SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" | ||
31 | SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" | ||
32 | SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" | ||
33 | SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" | ||
34 | SECURITY_CFLAGS_pn-python-imaging = "${SECURITY_NO_PIE_CFLAGS}" | ||
35 | SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" | ||
36 | SECURITY_CFLAGS_pn-python-smartpm = "${SECURITY_NO_PIE_CFLAGS}" | ||
37 | SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" | ||
38 | SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" | ||
39 | SECURITY_CFLAGS_pn-webkit-gtk = "${SECURITY_NO_PIE_CFLAGS}" | ||
40 | SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" | ||
20 | 41 | ||
21 | # These 2 have text relco errors with the pie options enabled | 42 | # These 2 have text relco errors with the pie options enabled |
22 | SECURITY_CFLAGS_pn-pulseaudio = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 43 | SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}" |
23 | SECURITY_CFLAGS_pn-ltp = "-fstack-protector-all -D_FORTIFY_SOURCE=2" | 44 | SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}" |
24 | 45 | ||
25 | TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}" | 46 | TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}" |
26 | TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}" | 47 | TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}" |