X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=dd24f179613beea37f3110fff2751683e92fc830;hb=02dd1a57b87d87bc0d7ea16d5b55464a6cb9ed3a;hp=3f5071c1e63973e5e06021cbceda482d0d8afaf4;hpb=970a7f8e15d8889433066e9276b548b89af30cb2;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 3f5071c1e..dd24f1796 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,19 +3,28 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.99.1+snapshot-${DATE}"
+DISTRO_VERSION = "4.99.3+snapshot-${DATE}"
+#DISTRO_VERSION = "4.99.3"
 DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.99.1"
+DISTRO_BRANCH_VERSION_TAG = "eel/4.99.3"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+AGL_BRANCH = "master"
+#for development
+AGL_APP_REVISION = "${AUTOREV}"
+#for release
+#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#for development
+AGL_DEFAULT_REVISION = "${AUTOREV}"
+#for release
+#AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+
+
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
 
 TARGET_VENDOR = "-agl"
 
-# Electric Eel 4.99.1 fixed SRCREVS
-require conf/distro/fixed-srcrevs-eel-4.99.1.inc
-
 # Override these in poky based distros
 AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
@@ -58,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.%"
@@ -96,6 +106,7 @@ 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.