X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=cc8b6b8448d4d778e9925e7ea73458b4ece6aa99;hb=refs%2Ftags%2Fflounder%2F5.99.1;hp=d7a12e301da151408505b80d70e5956920170c34;hpb=88a162a657936f14e8e1ac5d6a0c3b368d0e9a45;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 d7a12e301..cc8b6b844 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,21 +3,21 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "5.90.0+snapshot-${DATE}"
-#DISTRO_VERSION = "5.90.0"
+#DISTRO_VERSION = "5.99.1+snapshot-${DATE}"
+DISTRO_VERSION := "5.99.1"
 DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG = "flounder/5.90.0"
+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}"
-AGL_DEFAULT_REVISION = "${AUTOREV}"
+#AGL_APP_REVISION = "${AUTOREV}"
+#AGL_DEFAULT_REVISION = "${AUTOREV}"
 #for release
-#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-#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>"
@@ -66,29 +66,20 @@ 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"
 
-# GPLv3 Compliance
-PREFERRED_VERSION_bash          = "3.2.%"
-PREFERRED_VERSION_gawk          = "3.1.%"
-PREFERRED_VERSION_gdbm          = "1.8.%"
-PREFERRED_VERSION_gnupg         = "1.4.7"
-PREFERRED_VERSION_gnutls        = "3.3.%"
-PREFERRED_VERSION_mc            = "4.7.5.%"
-PREFERRED_VERSION_readline      = "5.2"
-
 # using multiple BSP layers causes dangling bbappends in meta-agl-bsp
 # turn it into a warning
 #BB_DANGLINGAPPENDS_WARNONLY = "1"
@@ -155,8 +146,14 @@ 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"
-