Post FF rc5 merge window open

[AGL/meta-agl.git] / meta-agl-distro / conf / distro / poky-agl.conf

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 0e94dca..1b28330 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -8,13 +8,12 @@ DISTRO_NAME = "Automotive Grade Linux"
 # Release flags
 DISTRO_CODENAME = "flounder"
 AGL_BRANCH = "master"
-AGLVERSION = "5.99.4"
+AGLVERSION = "5.99.5"
 # 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}"