X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=d0869f0bc18e177f750dca0e872a95267acf5c6f;hb=refs%2Fchanges%2F65%2F12765%2F1;hp=9c0334aaf372298de9f7cadece5621d138599f7e;hpb=5d544b04feb3c4da55b6ec9e0f1d0dd485f6b998;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 9c0334aaf..d0869f0bc 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,14 +3,14 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.99.2+snapshot-${DATE}"
-#DISTRO_VERSION = "4.99.2"
+DISTRO_VERSION = "4.99.4+snapshot-${DATE}"
+#DISTRO_VERSION = "4.99.4"
 DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.99.2"
+DISTRO_BRANCH_VERSION_TAG = "eel/4.99.4"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
-AGL_BRANCH = "master"
+AGL_BRANCH = "eel"
 #for development
 AGL_APP_REVISION = "${AUTOREV}"
 #for release
@@ -67,6 +67,7 @@ DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
+PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%"
 
 # Prefer GStreamer 1.10.x by default
 PREFERRED_VERSION_gstreamer1.0              ?= "1.10.%"
@@ -105,7 +106,6 @@ SECURITY_LDFLAGS_pn-libatasmart = ""
 
 # Not yet upstreamed; should be submitted.
 SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-mxml = ""
 
 #Redefined USER_CLASSES
 #Disable prelink. It is unmaintained and likely will go away.