X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=4d78c6c58e588088e19d74a99e3c3dbdf957fff6;hb=7839f7f0b3411102eb8c25b1971025a38d47da4a;hp=e60002ead980f5760b443db3fb61e54cc506220f;hpb=a7926710a4300645e9f295f2cb6fd790df13abf9;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 e60002ead..4d78c6c58 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.2+snapshot-${DATE}"
-DISTRO_VERSION := "5.99.2"
+DISTRO_VERSION = "5.99.2+snapshot-${DATE}"
+#DISTRO_VERSION := "5.99.2"
 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,8 @@ 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"