From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 27 Aug 2018 14:58:20 +0000 (+0200)
Subject: Bump distro post-rc4
X-Git-Tag: 5.99.5~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=d0fb94cab713bcbc99fb25131fc84fe9a6669b4e;p=AGL%2Fmeta-agl.git

Bump distro post-rc4

Open up development for rc5/final.

Change-Id: I8a724aec556e4020c60dc6e920c97ed776cf7499
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 0e94dca17..9c76d2473 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -10,11 +10,10 @@ DISTRO_CODENAME = "flounder"
 AGL_BRANCH = "master"
 AGLVERSION = "5.99.4"
 # switch  devel/release
-#AGLRELEASETYPE = "agldevelopment"
-AGLRELEASETYPE = "aglrelease"
+AGLRELEASETYPE ?= "agldevelopment"
+#AGLRELEASETYPE ?= "aglrelease"
 OVERRIDES .= ":${AGLRELEASETYPE}"
 #
-DISTRO_BRANCH_VERSION_TAG = "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 
 #for development
 DISTRO_VERSION_agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
@@ -23,6 +22,7 @@ AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
 
 #for release
 DISTRO_VERSION_aglrelease := "${AGLVERSION}"
+DISTRO_BRANCH_VERSION_TAG = "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"