summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorGan Yau Wai <yau.wai.gan@intel.com>2017-08-12 02:41:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 15:11:41 +0100
commit15fabf4d6507d2a3f9b98ad56e822eba35950662 (patch)
tree97671b0546f475e89cba97c9b519285a142ba952 /meta/classes
parent6aa5dcc472e6be971a4cef06aab5c1c125367eca (diff)
downloadopenembedded-core-15fabf4d6507d2a3f9b98ad56e822eba35950662.tar.gz
openembedded-core-15fabf4d6507d2a3f9b98ad56e822eba35950662.tar.bz2
openembedded-core-15fabf4d6507d2a3f9b98ad56e822eba35950662.zip
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@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>
Diffstat (limited to 'meta/classes')
-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 e541c72c2d..7bbe8b63a2 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