]> code.ossystems Code Review - openembedded-core.git/commitdiff
allarch: Append to vardepsexclude, not overwrite
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Jun 2017 09:09:29 +0000 (10:09 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Jun 2017 09:17:55 +0000 (10:17 +0100)
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>
meta/classes/allarch.bbclass

index a7ce024649ebb992e73eb9465cfcb2460b7f916a..51ba509cd0a28342e7b448df46f5c9c7d9aa73a9 100644 (file)
@@ -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"))
 }