diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-02-05 16:53:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-07 17:29:59 +0000 |
| commit | 281bd41d0bb396552406521cad9b85b2c91f8836 (patch) | |
| tree | e5d9233d91fc1638526853473312ab3b15f9ed28 /meta/conf | |
| parent | 61a58752f441db0550d0c7430fa110cebbf88ccd (diff) | |
| download | poky-281bd41d0bb396552406521cad9b85b2c91f8836.tar.gz | |
security_flags: wipe security flags for gcc/glibc and related libraries
It causes a catch-22 situation where we build libssp in gcc-runtime but also
pass -fstack-protector flags which require libssp
(From OE-Core rev: 61ef8212cc6880f502f1e05e2683d232ea782ae4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/security_flags.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 5e0ef634bf..235f4130f0 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
| @@ -39,8 +39,8 @@ SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}" | |||
| 39 | SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" | 39 | SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" |
| 40 | SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" | 40 | SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" |
| 41 | SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}" | 41 | SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}" |
| 42 | SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" | 42 | SECURITY_CFLAGS_pn-gcc-runtime = "" |
| 43 | SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" | 43 | SECURITY_CFLAGS_pn-gcc-sanitizers = "" |
| 44 | SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" | 44 | SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" |
| 45 | SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" | 45 | SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" |
| 46 | SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" | 46 | SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" |
| @@ -59,7 +59,7 @@ SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" | |||
| 59 | SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}" | 59 | SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}" |
| 60 | SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" | 60 | SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" |
| 61 | SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" | 61 | SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" |
| 62 | SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" | 62 | SECURITY_CFLAGS_pn-libgcc = "" |
| 63 | SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" | 63 | SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" |
| 64 | SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}" | 64 | SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}" |
| 65 | SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" | 65 | SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" |
| @@ -91,6 +91,11 @@ SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}" | |||
| 91 | TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}" | 91 | TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}" |
| 92 | TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" | 92 | TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" |
| 93 | 93 | ||
| 94 | SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" | ||
| 95 | SECURITY_LDFLAGS_remove_pn-gcc-sanitizers = "-fstack-protector-strong" | ||
| 96 | SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" | ||
| 97 | SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" | ||
| 98 | SECURITY_LDFLAGS_remove_pn-libgcc = "-fstack-protector-strong" | ||
| 94 | SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" | 99 | SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" |
| 95 | SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" | 100 | SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" |
| 96 | SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" | 101 | SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" |