diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:20:38 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:24:36 +0200 |
commit | 99cef05b4c32c401868c7f487784130e607ca74c (patch) | |
tree | 21c978e2209cddafd44e8b850eaa53dde7ed7553 /meta-agl-distro/conf/distro | |
parent | 0f1670b4b635d54c744a3e697be169957f321808 (diff) | |
parent | ffa9f4476251778974c77e35d924c20b29bf2792 (diff) |
Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'
Update the core distro to YP 2.6 'thud'.
Bug-AGL: SPEC-1837
Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-distro/conf/distro')
-rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 43 |
1 files changed, 8 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" |