X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=9b29bce53cbf976d5c199a39ee65605abda3ff31;hb=de05674fb955234fe399e633dec9003fc42022e1;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..9b29bce53 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -6,15 +6,14 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "flounder"
+DISTRO_CODENAME = "guppy"
 AGL_BRANCH = "master"
-AGLVERSION = "5.99.4"
+AGLVERSION = "6.99.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}"
@@ -23,6 +22,7 @@ AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
 
 #for release
 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}"
 
@@ -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>"
@@ -42,7 +42,7 @@ MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
 TARGET_VENDOR = "-agl"
 
 # Override these in poky based distros
-AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5"
+AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
 OVERRIDES .= ":${DISTRO_CODENAME}"
 
@@ -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}"