X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=83c555f1150ba31051670e44893df361ae7eb4f0;hb=e94d0f6b0d28858a372b514b500f71a8979d92d5;hp=065baf24f710ca7d30c518c1e79055e1e4e2d82b;hpb=b43165328658087277b667152fdbc04fe07cba08;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 065baf24f..83c555f11 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,21 +3,26 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "5.90.0+snapshot-${DATE}"
-#DISTRO_VERSION = "5.90.0"
+DISTRO_VERSION = "5.99.3+snapshot-${DATE}"
+#DISTRO_VERSION := "5.99.4"
 DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG = "flounder/5.90.0"
+DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+# SDKPATH is the folder where the SDK is going to be installed
+# Due to an issue with the qt5 environment (see SPEC-1667),
+# we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
+SDKPATH = "/opt/agl-sdk/${DISTRO_VERSION}-${DEFAULTTUNE}"
+
 AGL_BRANCH = "master"
 
 #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}"
+#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>"
@@ -155,5 +160,15 @@ PACKAGE_FEED_ARCHS = ""
 
 
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15)
-#DIRFILES_pn-nativesdk-cmake = "1"
+# (revalidate after 2017-10-15, 2018-06-12: still required)
+DIRFILES_pn-nativesdk-cmake = "1"
+
+# For https://jira.automotivelinux.org/browse/SPEC-1629 :
+# 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"