X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=9684a9740b580f3189b23aa099b05444cf193409;hb=refs%2Fchanges%2F99%2F11199%2F2;hp=0e3d831c9984a5d74636644f697e96a190ff6f08;hpb=ff41f296b133efc00cebe90d37123379af90f7f4;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 0e3d831c9..9684a9740 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,9 +3,9 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.90.0+snapshot-${DATE}"
+DISTRO_VERSION = "4.99.1+snapshot-${DATE}"
 DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.90.0"
+DISTRO_BRANCH_VERSION_TAG = "eel/4.99.1"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -56,13 +56,13 @@ DISTRO_FEATURES_remove = "x11"
 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.%"
+# Prefer GStreamer 1.10.x by default
+PREFERRED_VERSION_gstreamer1.0              ?= "1.10.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.10.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.10.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.10.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.10.%"
+PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.10.%"
 PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.%"
 
 # Prefer libjpeg-turbo
@@ -133,3 +133,8 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
+
+
+# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
+# (revalidate after 2017-10-15)
+DIRFILES_pn-nativesdk-cmake = "1"