X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=0e94dca17a0b0052dfd8d8f395f0b73c9dcc8a14;hb=8ca211abd1cccf583494d1afea56d079315ca35c;hp=671a6f5c1fc3be0c373c7695ffd86762914c3841;hpb=16d03b87304e2bcb01d97a560caf80ecd1d5afda;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 671a6f5c1..0e94dca17 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,21 +3,38 @@ 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.3"
-DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
-SDK_VENDOR = "-aglsdk"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+
+# Release flags
+DISTRO_CODENAME = "flounder"
 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
-#AGL_APP_REVISION = "${AUTOREV}"
-#AGL_DEFAULT_REVISION = "${AUTOREV}"
+DISTRO_VERSION_agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
+AGL_APP_REVISION_agldevelopment = "${AUTOREV}"
+AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
+
 #for release
-AGL_APP_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+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')}"
+
+# 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}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"