X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=73e21f17a0a48fb76dcc60c34900c68b22c91a08;hb=ba32016b5b4aa34059573f251e830e7eba873372;hp=4d78c6c58e588088e19d74a99e3c3dbdf957fff6;hpb=7839f7f0b3411102eb8c25b1971025a38d47da4a;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 4d78c6c58..73e21f17a 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.2+snapshot-${DATE}"
-#DISTRO_VERSION := "5.99.2"
-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 = "guppy"
 AGL_BRANCH = "master"
+AGLVERSION = "6.99.4"
+# switch  devel/release
+AGLRELEASETYPE ?= "agldevelopment"
+#AGLRELEASETYPE ?= "aglrelease"
+OVERRIDES .= ":${AGLRELEASETYPE}"
+#
 
 #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}"
+DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${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
+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/${SDK_VERSION}-${DEFAULTTUNE}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
@@ -64,7 +81,7 @@ VIRTUAL-RUNTIME_net_manager = "connman"
 
 DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
 
 PREFERRED_VERSION_wayland-ivi-extension ?= "2.0.%"
 
@@ -102,6 +119,7 @@ SECURITY_CFLAGS_pn-gpm = ""
 SECURITY_LDFLAGS_pn-gpm = ""
 SECURITY_CFLAGS_pn-libatasmart = ""
 SECURITY_LDFLAGS_pn-libatasmart = ""
+SECURITY_CFLAGS_pn-optee-client = ""
 
 # Not yet upstreamed; should be submitted.
 SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
@@ -162,3 +180,8 @@ DIRFILES_pn-nativesdk-cmake = "1"
 # We exclude the conflicting vars from the sstate task hash.
 # This needs to be verified.
 do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
+
+# For https://jira.automotivelinux.org/browse/SPEC-1677
+# Some issues appear, with the yocto version of valgrind, on aarch64.
+# (valgrind exits due to an unhandled instruction')
+PREFERRED_VERSION_valgrind ?= "git"