From 8ca211abd1cccf583494d1afea56d079315ca35c Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 24 Aug 2018 18:09:02 +0200
Subject: Prepare FF RC4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change the distro vars for RC4.

Change-Id: I74af40b74fd55bae4c0779c055ba97499c354e75
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 meta-agl-distro/conf/distro/poky-agl.conf | 36 ++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 83c555f11..0e94dca17 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,10 +3,31 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "5.99.3+snapshot-${DATE}"
-#DISTRO_VERSION := "5.99.4"
+
+
+# Release flags
 DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
+AGL_BRANCH = "master"
+AGLVERSION = "5.99.4"
+# switch  devel/release
+#AGLRELEASETYPE = "agldevelopment"
+AGLRELEASETYPE = "aglrelease"
+OVERRIDES .= ":${AGLRELEASETYPE}"
+#
+DISTRO_BRANCH_VERSION_TAG = "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
+
+#for development
+DISTRO_VERSION_agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
+AGL_APP_REVISION_agldevelopment = "${AUTOREV}"
+AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
+
+#for release
+DISTRO_VERSION_aglrelease := "${AGLVERSION}"
+AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+
+
+# SDK
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -15,15 +36,6 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 # 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}"
-
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
 
-- 
cgit 1.2.3-korg