summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-07-26 11:09:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:34 +0100
commitb521ee42e8a8c7cd7c4710cce52e1595b96a8fa2 (patch)
treecadb482047608fa8ba04da4a80f060158f05f680 /meta
parentc65d565e239be1e991080a37a261a1267bdda19c (diff)
downloadpoky-b521ee42e8a8c7cd7c4710cce52e1595b96a8fa2.tar.gz
package.bbclass: append to FILERPROVIDES_*/FILERDEPENDS_* variables instead of setting them
* this allows to work around some of the issues with file-rdeps * e.g. in my case I have /usr/lib/libmali.so.0.1 which according to rpmdeps provides only following libmali* libmali.so(LIBMALI_1.0) libmali.so.0.1 but many users of this link with libmali.so directly and according to rpmdeps require libmali.so which causes file-rdeps for a lot of recipes * I was using simple work around to just set: RPROVIDES_${PN} = "libmali.so libGLESv2.so libEGL.so" but that doesn't work well with multilib, because the value gets expanded with MLPREFIX and RPROVIDES_${PN} = "lib32-libmali.so lib32-libGLESv2.so lib32-libEGL.so" doesn't help at all. [YOCTO #9217] Many unsolveable QA warnings from build-deps and file-rdeps (From OE-Core rev: 01b9810ff1cea53ae321f6fbe760b83573ed78c0) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 546047c741..80233a8f5e 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1557,12 +1557,12 @@ python package_do_filedeps() {
1557 for file in provides: 1557 for file in provides:
1558 provides_files[pkg].append(file) 1558 provides_files[pkg].append(file)
1559 key = "FILERPROVIDES_" + file + "_" + pkg 1559 key = "FILERPROVIDES_" + file + "_" + pkg
1560 d.setVar(key, " ".join(provides[file])) 1560 d.appendVar(key, " " + " ".join(provides[file]))
1561 1561
1562 for file in requires: 1562 for file in requires:
1563 requires_files[pkg].append(file) 1563 requires_files[pkg].append(file)
1564 key = "FILERDEPENDS_" + file + "_" + pkg 1564 key = "FILERDEPENDS_" + file + "_" + pkg
1565 d.setVar(key, " ".join(requires[file])) 1565 d.appendVar(key, " " + " ".join(requires[file]))
1566 1566
1567 for pkg in requires_files: 1567 for pkg in requires_files:
1568 d.setVar("FILERDEPENDSFLIST_" + pkg, " ".join(requires_files[pkg])) 1568 d.setVar("FILERDEPENDSFLIST_" + pkg, " ".join(requires_files[pkg]))