]> code.ossystems Code Review - openembedded-core.git/commitdiff
insane.bbclass: fix override handling in RDEPENDS QA
authorGan Yau Wai <yau.wai.gan@intel.com>
Sat, 12 Aug 2017 00:34:54 +0000 (02:34 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 Aug 2017 10:54:25 +0000 (11:54 +0100)
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

[YOCTO #11374]

Signed-off-by: Gan Yau Wai <yau.wai.gan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/classes/insane.bbclass

index dc1c2f8d41acdc35fb2f3b22c10eaae8c4057b42..5a3d017004d4b6bef76343288da9cc60b8ede698 100644 (file)
@@ -867,7 +867,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') + ':' + pkg)
 
         # Now check the RDEPENDS
         rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or "")