Update eel branch defaults

[AGL/meta-agl.git] / meta-agl-distro / conf / distro / poky-agl.conf

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 00c46c4..d38059e 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,22 +3,22 @@ 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_VERSION = "4.99.3+snapshot-${DATE}"
+#DISTRO_VERSION = "4.99.3"
 DISTRO_CODENAME = "eel"
 DISTRO_BRANCH_VERSION_TAG = "eel/4.99.3"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
-AGL_BRANCH = "master"
+AGL_BRANCH = "eel"
 #for development
-#AGL_APP_REVISION = "${AUTOREV}"
+AGL_APP_REVISION = "${AUTOREV}"
 #for release
-AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 #for development
-#AGL_DEFAULT_REVISION = "${AUTOREV}"
+AGL_DEFAULT_REVISION = "${AUTOREV}"
 #for release
-AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
 
 MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
@@ -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.