From: Richard Purdie Date: Fri, 30 Sep 2016 16:43:23 +0000 (+0100) Subject: allarch: Fixes to stop rebuilds when change multilibs X-Git-Tag: 2016-10~165 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ce1e7fcc60276040477c1d5e3129e029bb9f204b;p=openembedded-core.git allarch: Fixes to stop rebuilds when change multilibs When changing multilibs, allarch recipes should not be rebuilding. This adds enough variable exclusions to make this work properly. Future regressions will be prevented with new testing. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 208cde6e5e..ddc2a85050 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -17,6 +17,7 @@ python () { # Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory # naming anyway + d.setVar("baselib", "lib") d.setVar("TARGET_ARCH", "allarch") d.setVar("TARGET_OS", "linux") d.setVar("TARGET_CC_ARCH", "none") @@ -41,6 +42,10 @@ python () { d.setVar("EXCLUDE_FROM_SHLIBS", "1") d.setVar("INHIBIT_PACKAGE_DEBUG_SPLIT", "1") 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") 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", True)) }