Added XDG compatibility to ivi-shell

[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 4931f96..ce15355 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,12 +3,24 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.90.0+snapshot-${DATE}"
+#DISTRO_VERSION = "4.99.3+snapshot-${DATE}"
+DISTRO_VERSION = "4.99.3"
 DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.90.0"
+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"
@@ -55,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.%"
@@ -93,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.
@@ -133,3 +147,9 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
+
+
+# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
+# (revalidate after 2017-10-15)
+DIRFILES_pn-nativesdk-cmake = "1"
+