aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-distro
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-distro')
-rw-r--r--meta-agl-distro/conf/distro/poky-agl.conf43
-rw-r--r--meta-agl-distro/conf/layer.conf2
2 files changed, 10 insertions, 35 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 2d0383644..601d447f6 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -83,16 +83,14 @@ DISTRO_FEATURES_APPEND = " "
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
-PREFERRED_VERSION_wayland-ivi-extension ?= "2.0.%"
-
-# Prefer GStreamer 1.10.x by default
-PREFERRED_VERSION_gstreamer1.0 ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-libav ?= "1.12.%"
-PREFERRED_VERSION_gstreamer1.0-omx ?= "1.12.%"
+# Prefer GStreamer 1.14.x by default
+PREFERRED_VERSION_gstreamer1.0 ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-libav ?= "1.14.%"
+PREFERRED_VERSION_gstreamer1.0-omx ?= "1.14.%"
# Prefer libjpeg-turbo
PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
@@ -101,26 +99,6 @@ PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
# turn it into a warning
#BB_DANGLINGAPPENDS_WARNONLY = "1"
-# enforce security-related compiler flags by default
-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_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 = ""
-SECURITY_CFLAGS_pn-optee-client = ""
-
# Not yet upstreamed; should be submitted.
SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
@@ -180,8 +158,3 @@ DIRFILES_pn-nativesdk-cmake = "1"
# We exclude the conflicting vars from the sstate task hash.
# This needs to be verified.
do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
-
-# For https://jira.automotivelinux.org/browse/SPEC-1677
-# Some issues appear, with the yocto version of valgrind, on aarch64.
-# (valgrind exits due to an unhandled instruction')
-PREFERRED_VERSION_valgrind ?= "git"
diff --git a/meta-agl-distro/conf/layer.conf b/meta-agl-distro/conf/layer.conf
index 9810f4a3e..3c60fd4c7 100644
--- a/meta-agl-distro/conf/layer.conf
+++ b/meta-agl-distro/conf/layer.conf
@@ -8,3 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "agl-distro"
BBFILE_PATTERN_agl-distro = "^${LAYERDIR}/"
BBFILE_PRIORITY_agl-distro = "70"
+
+LAYERSERIES_COMPAT_agl-distro = "thud"