From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Sun, 29 Jul 2018 00:00:03 +0000 (+0200)
Subject: Mask conflicting variables from package_write_rpm hash
X-Git-Tag: flounder/5.99.3~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F15841%2F7;p=AGL%2Fmeta-agl.git

Mask conflicting variables from package_write_rpm hash

See https://jira.automotivelinux.org/browse/SPEC-1629 for the details.

Bug-AGL: SPEC-1629

Change-Id: Id828aab52826b14005d69af5bfaddc4a4c709842
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index f217f783d..4d78c6c58 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -157,3 +157,8 @@ PACKAGE_FEED_ARCHS = ""
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
 # (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"