X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=017168386ba565a72054d3e20e0d4cd82a4eab61;hb=499444bfa941074d7328c86acce664abcc66013e;hp=dd24f179613beea37f3110fff2751683e92fc830;hpb=02dd1a57b87d87bc0d7ea16d5b55464a6cb9ed3a;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 dd24f1796..017168386 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.99.3+snapshot-${DATE}"
+DISTRO_VERSION := "5.99.3"
+DISTRO_CODENAME = "flounder"
+DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 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,16 +66,16 @@ DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
-PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%"
+PREFERRED_VERSION_wayland-ivi-extension ?= "2.0.%"
 
 # 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"
@@ -106,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.
@@ -148,8 +146,19 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
 
+# enable the packagemanagement
+IMAGE_FEATURES =+ "package-management"
+PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/"
+PACKAGE_FEED_BASE_PATHS = "rpm"
+PACKAGE_FEED_ARCHS = ""
+#${PACKAGE_ARCHS}"
+
 
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15)
+# (revalidate after 2017-10-15, 2018-06-12: still required)
 DIRFILES_pn-nativesdk-cmake = "1"
 
+# For https://jira.automotivelinux.org/browse/SPEC-1629 :
+# We exclude the conflicting vars from the sstate task hash.
+# This needs to be verified.
+do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"