Cut GG rc4 v6.99.4

[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 1b28330..1c84f37 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -6,12 +6,12 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "flounder"
+DISTRO_CODENAME = "guppy"
 AGL_BRANCH = "master"
-AGLVERSION = "5.99.5"
+AGLVERSION = "6.99.4"
 # switch  devel/release
-AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+#AGLRELEASETYPE ?= "agldevelopment"
+AGLRELEASETYPE ?= "aglrelease"
 OVERRIDES .= ":${AGLRELEASETYPE}"
 #
 
@@ -22,7 +22,7 @@ AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
 
 #for release
 DISTRO_VERSION_aglrelease := "${AGLVERSION}"
-DISTRO_BRANCH_VERSION_TAG = "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
+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}"
 
@@ -34,7 +34,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>"
@@ -81,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.%"
 
@@ -119,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}"