From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 13 Jun 2017 09:09:29 +0000 (+0100)
Subject: allarch: Append to vardepsexclude, not overwrite
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~21084
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b756fd12c28d1ce3ca60b328927db996c6a52424;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

allarch: Append to vardepsexclude, not overwrite

These have values set elsewhere and this code was overwriting them leading
to odd signature issues. Append instead preserving the original values.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index a7ce024649e..51ba509cd0a 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -43,8 +43,8 @@ python () {
         d.setVar("INHIBIT_PACKAGE_STRIP", "1")
 
         # These multilib values shouldn't change allarch packages so exclude them
-        d.setVarFlag("emit_pkgdata", "vardepsexclude", "MULTILIB_VARIANTS")
-        d.setVarFlag("write_specfile", "vardepsexclude", "MULTILIBS")
+        d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS")
+        d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS")
     elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d):
         bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE"))
 }