summaryrefslogtreecommitdiffstats
path: root/meta/classes/allarch.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-13 10:09:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:28 +0100
commite8c980ff0c2413c0b67e2f3ac57bed5669291961 (patch)
treeadd27a406461a4421df29057c55714c19ad2c695 /meta/classes/allarch.bbclass
parent2db8f3265e3b253f9e21301661f9fbe102aa595a (diff)
downloadpoky-e8c980ff0c2413c0b67e2f3ac57bed5669291961.tar.gz
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. (From OE-Core rev: b756fd12c28d1ce3ca60b328927db996c6a52424) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/allarch.bbclass')
-rw-r--r--meta/classes/allarch.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index a7ce024649..51ba509cd0 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -43,8 +43,8 @@ python () {
43 d.setVar("INHIBIT_PACKAGE_STRIP", "1") 43 d.setVar("INHIBIT_PACKAGE_STRIP", "1")
44 44
45 # These multilib values shouldn't change allarch packages so exclude them 45 # These multilib values shouldn't change allarch packages so exclude them
46 d.setVarFlag("emit_pkgdata", "vardepsexclude", "MULTILIB_VARIANTS") 46 d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS")
47 d.setVarFlag("write_specfile", "vardepsexclude", "MULTILIBS") 47 d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS")
48 elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): 48 elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d):
49 bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) 49 bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE"))
50} 50}