poky-agl: exempt qtwebengine from security flags

[AGL/meta-agl.git] / meta-agl-distro / conf / distro / poky-agl.conf

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 94e4f80..ccaae9b 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -55,13 +55,13 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
 
 # Prefer GStreamer 1.8.x by default
-PREFERRED_VERSION_gstreamer1.0              ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.8%"
+PREFERRED_VERSION_gstreamer1.0              ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.%"
 
 # Prefer libjpeg-turbo
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
@@ -71,15 +71,22 @@ PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 #BB_DANGLINGAPPENDS_WARNONLY = "1"
 
 # enforce security-related compiler flags by default
-#require conf/distro/include/security_flags.inc
+require conf/distro/include/security_flags.inc
 # required overrides, upstreamed but not merged yet:
 # http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107727.html
-#SECURITY_CFLAGS_pn-llvm3.3 = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-llvm3.3 = ""
+SECURITY_LDFLAGS_remove_pn-llvm3.3 = "-fstack-protector-strong"
 SECURITY_STRINGFORMAT_pn-gpm = ""
 SECURITY_CFLAGS_pn-libdbus-c++ = ""
 SECURITY_LDFLAGS_pn-libdbus-c++ = ""
 
+# Not yet upstreamed; should be submitted.
+SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
+
 #Redefined USER_CLASSES
 #Disable prelink. It is unmaintained and likely will go away.
 #default: USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 USER_CLASSES = "buildstats image-mklibs"
+
+# weak 'default value' assignment for a DEFAULTTUNE
+DEFAULTTUNE_arm ??= "armv7athf-neon"