summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-05 16:53:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:29:59 +0000
commit281bd41d0bb396552406521cad9b85b2c91f8836 (patch)
treee5d9233d91fc1638526853473312ab3b15f9ed28
parent61a58752f441db0550d0c7430fa110cebbf88ccd (diff)
downloadpoky-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>
-rw-r--r--meta/conf/distro/include/security_flags.inc11
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}"
39SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" 39SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}"
40SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" 40SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}"
41SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}" 41SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}"
42SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" 42SECURITY_CFLAGS_pn-gcc-runtime = ""
43SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" 43SECURITY_CFLAGS_pn-gcc-sanitizers = ""
44SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" 44SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}"
45SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" 45SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}"
46SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" 46SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}"
@@ -59,7 +59,7 @@ SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}"
59SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}" 59SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}"
60SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" 60SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}"
61SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" 61SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}"
62SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" 62SECURITY_CFLAGS_pn-libgcc = ""
63SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" 63SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}"
64SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}" 64SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}"
65SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" 65SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}"
@@ -91,6 +91,11 @@ SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
91TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}" 91TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}"
92TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" 92TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
93 93
94SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong"
95SECURITY_LDFLAGS_remove_pn-gcc-sanitizers = "-fstack-protector-strong"
96SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong"
97SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong"
98SECURITY_LDFLAGS_remove_pn-libgcc = "-fstack-protector-strong"
94SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" 99SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}"
95SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" 100SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}"
96SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" 101SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}"