summaryrefslogtreecommitdiffstats
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-11 09:03:58 +0100
commit5602f64ab8c3654737273c0e7ac1c966fa8afb6a (patch)
tree83669c6e4ceaf045e68bf70973e3d6bae4f90158
parentfab626cdf387c5b4a4838074294cade1e6129a4f (diff)
downloadpoky-5602f64ab8c3654737273c0e7ac1c966fa8afb6a.tar.gz
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. (From OE-Core rev: 2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e) 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 15d2d044e4..89a24d97b4 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -53,6 +53,12 @@ do_deploy_all_archives[dirs] = "${WORKDIR}"
53 53
54python () { 54python () {
55 pn = d.getVar('PN', True) 55 pn = d.getVar('PN', True)
56 assume_provided = (d.getVar("ASSUME_PROVIDED", True) or "").split()
57 if pn in assume_provided:
58 for p in d.getVar("PROVIDES", True).split():
59 if p != pn:
60 pn = p
61 break
56 62
57 included, reason = copyleft_should_include(d) 63 included, reason = copyleft_should_include(d)
58 if not included: 64 if not included: