X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=4afdf5a03ff3687fab2c12663d5aa6efed76aeae;hb=07d0d613cbca9619e3ad5361d39ae0feafbcb168;hp=00c46c4123ea60b24cda8a0d83d6c42f129440eb;hpb=9cdd1e7b5678d426cadfb25f679a9216d50cfa61;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 00c46c412..4afdf5a03 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,22 +3,21 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-#DISTRO_VERSION = "4.99.3+snapshot-${DATE}"
-DISTRO_VERSION = "4.99.3"
-DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.99.3"
+DISTRO_VERSION = "5.90.0+snapshot-${DATE}"
+#DISTRO_VERSION = "5.90.0"
+DISTRO_CODENAME = "flounder"
+DISTRO_BRANCH_VERSION_TAG = "flounder/5.90.0"
 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}"
+AGL_APP_REVISION = "${AUTOREV}"
+AGL_DEFAULT_REVISION = "${AUTOREV}"
 #for release
-AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
@@ -67,15 +66,16 @@ 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.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.10.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.10.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.10.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.10.%"
-PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.10.%"
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.%"
+PREFERRED_VERSION_gstreamer1.0              ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.12.%"
+PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.12.%"
 
 # Prefer libjpeg-turbo
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
@@ -105,7 +105,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.