aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-09 23:16:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-09 23:17:52 +0100
commit2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e (patch)
tree70c8ce65247c1fdfac3abc90b6903f315294196a
parentc0a701a2165e858ec13b991943cc783bc4186fb9 (diff)
downloadopenembedded-core-contrib-2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e.tar.gz
openembedded-core-contrib-2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e.tar.bz2
openembedded-core-contrib-2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e.zip
archiver: Fix ASSUME_PROVIDED issues
Currently the dependencies injected by this class for recipes in ASSUME_PROVIDED e.g. tar-native or chrpath-native are ignored. We need to use their "replacement" names, e.g. tar-replacement-native. This avoids broken archives and sstate failures with these recipes. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/archiver.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 15d2d044e4b..89a24d97b46 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -53,6 +53,12 @@ do_deploy_all_archives[dirs] = "${WORKDIR}"
python () {
pn = d.getVar('PN', True)
+ assume_provided = (d.getVar("ASSUME_PROVIDED", True) or "").split()
+ if pn in assume_provided:
+ for p in d.getVar("PROVIDES", True).split():
+ if p != pn:
+ pn = p
+ break
included, reason = copyleft_should_include(d)
if not included: