From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 11 Dec 2017 20:03:57 +0000 (+0100)
Subject: Eel branch open for final merge window before v5.0.0
X-Git-Tag: 4.99.5~11
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F12445%2F2;p=AGL%2Fmeta-agl.git

Eel branch open for final merge window before v5.0.0

Change-Id: I7f1ac72b10974d810b2f7e369ab0434f649c89ce
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12445
---

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 37c319eaf..d0869f0bc 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 = "4.99.4+snapshot-${DATE}"
-DISTRO_VERSION = "4.99.4"
+DISTRO_VERSION = "4.99.4+snapshot-${DATE}"
+#DISTRO_VERSION = "4.99.4"
 DISTRO_CODENAME = "eel"
 DISTRO_BRANCH_VERSION_TAG = "eel/4.99.4"
 SDK_VENDOR = "-aglsdk"
@@ -12,13 +12,13 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 AGL_BRANCH = "eel"
 #for development
-#AGL_APP_REVISION = "${AUTOREV}"
+AGL_APP_REVISION = "${AUTOREV}"
 #for release
-AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 #for development
-#AGL_DEFAULT_REVISION = "${AUTOREV}"
+AGL_DEFAULT_REVISION = "${AUTOREV}"
 #for release
-AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"