X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=bc2959ac99fc038d06a9813a4d0d049dbf0635af;hb=b282be7cf939f7a8a230430b3afcaa554efc996f;hp=f852b50f6ad38901c510079eef31a31940a93c49;hpb=16aa39224d1b4691d3d2a109a860f904a94ff708;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 f852b50f6..bc2959ac9 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,12 +3,22 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "3.99.1+snapshot-${DATE}"
-DISTRO_CODENAME = "dab"
-DISTRO_BRANCH_VERSION_TAG = "dab/3.99.1"
+#DISTRO_VERSION = "5.0.3+snapshot-${DATE}"
+DISTRO_VERSION = "5.0.3"
+DISTRO_CODENAME = "eel"
+DISTRO_BRANCH_VERSION_TAG := "${DISTRO_CODENAME}/${DISTRO_VERSION}"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+AGL_BRANCH = "eel"
+#for development
+#AGL_APP_REVISION = "${AUTOREV}"
+#AGL_DEFAULT_REVISION = "${AUTOREV}"
+#for release
+AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+
+
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
 
 TARGET_VENDOR = "-agl"
@@ -55,14 +65,15 @@ DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
+PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%"
 
-# 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 +144,9 @@ 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"
+