summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGan, Yau Wai <yau.wai.gan@intel.com>2017-05-31 17:24:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:06 +0100
commit2d739a352b6aaef0fd5e4de57cc2e0dbcb44f3ae (patch)
treea216daf1d3da8dd12b61dbdcd395a8eee7fb9679
parent693878a3e9fdc7ed79e7de258ec9927440b0561a (diff)
downloadpoky-2d739a352b6aaef0fd5e4de57cc2e0dbcb44f3ae.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. [YOCTO #11374] (From OE-Core rev: 60d28dd72daee235150ab6605cbf953f1ea691df) Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
867 867
868 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: 868 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
869 localdata = bb.data.createCopy(d) 869 localdata = bb.data.createCopy(d)
870 localdata.setVar('OVERRIDES', pkg) 870 localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES') + ':' + pkg)
871 871
872 # Now check the RDEPENDS 872 # Now check the RDEPENDS
873 rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or "") 873 rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or "")