[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2805/8267] allarch: Fixes to stop rebuilds when change multilibs



commit a9b3a6dade2495fedcb1f54fc97bcf2f7d082ae2
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Sep 30 17:43:23 2016 +0100

    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.
    
    (From OE-Core rev: ce1e7fcc60276040477c1d5e3129e029bb9f204b)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/allarch.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 208cde6..ddc2a85 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))
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]