archiver: Fix ASSUME_PROVIDED issues

PATCH New Richard Purdie 1 participant 1 message Apr 9, 2016

Share & tools

Richard Purdie

author

2016-04-09 22:16 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/classes/archiver.bbclass +6 -0

index 15d2d04..89a24d9 100644
@@ -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: