summaryrefslogtreecommitdiffstats
path: root/meta
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 16:50:54 +0100
commit5224bf7c7271eaed5a278c0282929baaf2e7ddaa (patch)
treead759482430e2ac3920ddc70f2bbcf9a0638235f /meta
parent1d063ba492465dc733965e50e8f7a379bf7e61ff (diff)
downloadpoky-5224bf7c7271eaed5a278c0282929baaf2e7ddaa.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 and modified to work with older bitbake where 2nd parameter in localdata.getVar was mandatory. [YOCTO #11374] (From OE-Core rev: 15fabf4d6507d2a3f9b98ad56e822eba35950662) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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):
833 833
834 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: 834 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
835 localdata = bb.data.createCopy(d) 835 localdata = bb.data.createCopy(d)
836 localdata.setVar('OVERRIDES', pkg) 836 localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', True) + ':' + pkg)
837 bb.data.update_data(localdata) 837 bb.data.update_data(localdata)
838 838
839 # Now check the RDEPENDS 839 # Now check the RDEPENDS