summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/security_flags.inc8
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc2
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}"
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}"
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):
38 38
39 pn = d.getVar("PN") 39 pn = d.getVar("PN")
40 d.appendVar('RDEPENDS_' + pn, ' ' + abi) 40 d.appendVar('RDEPENDS_' + pn, ' ' + abi)
41
42SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}"