X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=4c630ebf054bb42b1b4d4b3d089e9612b5e4def6;hb=dcb3dfede296347bc5194e55f0cc34a7f9a672a3;hp=cc8b6b8448d4d778e9925e7ea73458b4ece6aa99;hpb=d12df8891a511157440d069f4745c70483abcaeb;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 cc8b6b844..4c630ebf0 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,8 +3,8 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-#DISTRO_VERSION = "5.99.1+snapshot-${DATE}"
-DISTRO_VERSION := "5.99.1"
+DISTRO_VERSION = "5.99.3+snapshot-${DATE}"
+#DISTRO_VERSION := "5.99.4"
 DISTRO_CODENAME = "flounder"
 DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 SDK_VENDOR = "-aglsdk"
@@ -13,11 +13,11 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 AGL_BRANCH = "master"
 
 #for development
-#AGL_APP_REVISION = "${AUTOREV}"
-#AGL_DEFAULT_REVISION = "${AUTOREV}"
+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>"
@@ -157,3 +157,13 @@ PACKAGE_FEED_ARCHS = ""
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
 # (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"