[oe-commits] [openembedded-core] 03/03: archiver: Fix ASSUME_PROVIDED issues

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Apr 9 23:16:47 2016 +0100

    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 at linuxfoundation.org>
---
 meta/classes/archiver.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 15d2d04..89a24d9 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.