X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=bbf4f01de7f440c9866d5b6d2188efa726b84023;hb=refs%2Ftags%2Fflounder_6.0.4;hp=0e94dca17a0b0052dfd8d8f395f0b73c9dcc8a14;hpb=8ca211abd1cccf583494d1afea56d079315ca35c;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 0e94dca17..bbf4f01de 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -7,24 +7,22 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 # Release flags
 DISTRO_CODENAME = "flounder"
-AGL_BRANCH = "master"
-AGLVERSION = "5.99.4"
+AGL_BRANCH = "flounder"
+AGLVERSION = "6.0.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}"
 AGL_APP_REVISION_agldevelopment = "${AUTOREV}"
-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}"
 
 
 # SDK
@@ -34,7 +32,7 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 # SDKPATH is the folder where the SDK is going to be installed
 # Due to an issue with the qt5 environment (see SPEC-1667),
 # we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
-SDKPATH = "/opt/agl-sdk/${DISTRO_VERSION}-${DEFAULTTUNE}"
+SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"