X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=70dcb3f806239bf4337a1655817cefd8967f0c4c;hb=21169829e77c8ec93a3a3287e478eea9a2ce2129;hp=94e4f8000eebf62eb10553606cc55c9ebb39fed2;hpb=be2f69556bc35885454bb51b7fbc1b188b9e7e27;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 94e4f8000..70dcb3f80 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,8 +3,9 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "3.90.0+snapshot-${DATE}"
+DISTRO_VERSION = "3.99.1+snapshot-${DATE}"
 DISTRO_CODENAME = "dab"
+DISTRO_BRANCH_VERSION_TAG = "dab/3.99.1"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -15,6 +16,7 @@ TARGET_VENDOR = "-agl"
 # Override these in poky based distros
 AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
+OVERRIDES .= ":${DISTRO_CODENAME}"
 
 QEMU_TARGETS ?= "arm aarch64 i386 x86_64"
 # Other QEMU_TARGETS "mips mips64 mips64el ppc sh4"
@@ -55,13 +57,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 +73,43 @@ 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++ = ""
 
+# more than 2 targets fail to compile these with the SECURITY compiler flags:
+# Bug tracked as SPEC-593
+SECURITY_CFLAGS_pn-mozjs = ""
+SECURITY_LDFLAGS_pn-mozjs = ""
+SECURITY_CFLAGS_pn-gpm = ""
+SECURITY_LDFLAGS_pn-gpm = ""
+SECURITY_CFLAGS_pn-libatasmart = ""
+SECURITY_LDFLAGS_pn-libatasmart = ""
+
+# 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"
+
+# AGL uses 4 optimization levels
+# 2 for ARM 32bit 
+#   - a high and a medium setting for the CCARGS
+#   - the high setting is default (needs >= cortex-a15)
+#   - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler "
+# 1 for ARM 64bit / AARCH64
+# 1 for x86-64
+require conf/distro/include/${TARGET_ARCH}-tune.inc
+
+# Generic qemu and qemuboot (runqemu) enhancements
+# check qemuboot.bbclass
+# - use 1G RAM by default
+QB_MEM ?= "-m 1024"
+