diff options
author | Gan Yau Wai <yau.wai.gan@intel.com> | 2017-08-12 02:34:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-29 11:57:29 +0100 |
commit | b4ea7bfad69ff8aaab76a3b6c282325a617b4841 (patch) | |
tree | 002283bb9eae047f4ca209899010bd4940309407 | |
parent | 4ec0cbceec16a8d949d58d4de9ff51255e530440 (diff) | |
download | poky-b4ea7bfad69ff8aaab76a3b6c282325a617b4841.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]
(From OE-Core rev: ca84390b7894adb32a89ccfbd83fbb3fb7e808fc)
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>
-rw-r--r-- | meta/classes/insane.bbclass | 2 |
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 "") |