X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=4d78c6c58e588088e19d74a99e3c3dbdf957fff6;hb=7839f7f0b3411102eb8c25b1971025a38d47da4a;hp=8e8fd7ae12c56dad89f438c89f32ba26bf45f780;hpb=501036b3c02c084277011ae77d436bb08096ee58;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 8e8fd7ae1..4d78c6c58 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,10 +3,10 @@ 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.2+snapshot-${DATE}"
+#DISTRO_VERSION := "5.99.2"
 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')}"
 
@@ -16,8 +16,8 @@ AGL_BRANCH = "master"
 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>"
@@ -146,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"