diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-01 09:16:56 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 10:54:33 +0000 |
| commit | 27fce6ec277788f8fad0c9799e784df80f791120 (patch) | |
| tree | b790f3582d4cc812b1f4ae3081f9749f0b1c55f1 | |
| parent | 2ad3b8ae1c56a46bf14fc6bc4c34e4b3a568d741 (diff) | |
| download | openembedded-core-27fce6ec277788f8fad0c9799e784df80f791120.tar.gz openembedded-core-27fce6ec277788f8fad0c9799e784df80f791120.tar.bz2 openembedded-core-27fce6ec277788f8fad0c9799e784df80f791120.zip | |
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>
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/conf/distro/include/security_flags.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 2 |
2 files changed, 4 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}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" -SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" +# All xorg module drivers need to be linked this way as well and are +# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index fe42f11b68..bca0aade6c 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -38,3 +38,5 @@ def _add_xorg_abi_depends(d, name): pn = d.getVar("PN") d.appendVar('RDEPENDS_' + pn, ' ' + abi) + +SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" |