[oe-commits] [openembedded-core] 41/41: insane.bbclass: fix override handling in RDEPENDS QA

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch morty-next
in repository openembedded-core.

commit 15fabf4d6507d2a3f9b98ad56e822eba35950662
Author: Gan Yau Wai <yau.wai.gan at intel.com>
AuthorDate: Sat Aug 12 02:41:45 2017 +0200

    insane.bbclass: fix override handling in RDEPENDS QA
    
    The package_qa_check_rdepends() in insane.bbclass has
    incorrectly replace its localdata OVERRIDES value with
    the package name. Fixing it by appending the package name
    to the existing OVERRIDES value. This resolves RDEPENDS QA
    error when setting PACKAGECONFIG using a pn- override at
    local.conf.
    
    Cherry picked from master 60d28dd72daee235150ab6605cbf953f1ea691df
    and modified to work with older bitbake where 2nd parameter in
    localdata.getVar was mandatory.
    
    [YOCTO #11374]
    
    Signed-off-by: Gan Yau Wai <yau.wai.gan at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index e541c72..7bbe8b6 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -833,7 +833,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
 
     if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
         localdata = bb.data.createCopy(d)
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', True) + ':' + pkg)
         bb.data.update_data(localdata)
 
         # Now check the RDEPENDS

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.