[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6283/8267] allarch: Append to vardepsexclude, not overwrite



commit e8c980ff0c2413c0b67e2f3ac57bed5669291961
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Jun 13 10:09:29 2017 +0100

    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>

 meta/classes/allarch.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index a7ce024..51ba509 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"))
 }


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