aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGan Yau Wai <yau.wai.gan@intel.com>2017-08-12 02:34:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 11:54:25 +0100
commitca84390b7894adb32a89ccfbd83fbb3fb7e808fc (patch)
treea3f322f2a282dfc51546b7219aeecb076f02219b
parentb07bcfa3e4400f7763e2276f9be3dc702bb58c2e (diff)
downloadopenembedded-core-contrib-ca84390b7894adb32a89ccfbd83fbb3fb7e808fc.tar.gz
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 [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>
-rw-r--r--meta/classes/insane.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index dc1c2f8d41..5a3d017004 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -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 "")