X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=bbcebc4fd1c26228e9b57772f87fb51d2ad55210;hb=e72dd9bb479e3d52c3e06137f41db910a1d9daf3;hp=8ed106950006744bb43554d660111f5ce91730d1;hpb=e6f5e55cdaff2f96828f4edf00bd1cafbda28fed;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 8ed106950..bbcebc4fd 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -7,8 +7,8 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 # Release flags
 DISTRO_CODENAME = "guppy"
-AGL_BRANCH = "master"
-AGLVERSION = "6.90.0"
+AGL_BRANCH = "guppy"
+AGLVERSION = "7.0.0"
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
 #AGLRELEASETYPE ?= "aglrelease"
@@ -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}"