summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-02-01 09:16:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:27 +0000
commitd2ade75708dda26ddac20642d5b02e052ebb41e5 (patch)
tree13df2d515ba1f3472285b4096aa83732de3cac2c /meta/conf/distro/include
parent95dbd9d28798bdd1ca9bd9d4ab84e0d537cacdc8 (diff)
downloadpoky-d2ade75708dda26ddac20642d5b02e052ebb41e5.tar.gz
security_flags.inc, xorg-driver-common.inc: Move SECURITY_X_LDFLAGS logic
We need to ensure that all xorg modules are linked with SECURITY_X_LDFLAGS to ensure that they will be able to resolve their run time dependencies. The approach of listing each driver in security_flags.inc lets less frequently used drivers be run-time broken. Move the flag logic into xorg-driver-common.inc so that all xorg modules from all layers will have the correct security flags used. Cc: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: 27fce6ec277788f8fad0c9799e784df80f791120) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r--meta/conf/distro/include/security_flags.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 7ea1049edf..49d2417a88 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -59,12 +59,8 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
59SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" 59SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong"
60SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" 60SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong"
61SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" 61SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong"
62SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" 62# All xorg module drivers need to be linked this way as well and are
63SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" 63# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc
64SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}"
65SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}"
66SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}"
67SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}"
68SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" 64SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}"
69 65
70TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}" 66TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}"