From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 9 Apr 2016 22:16:47 +0000 (+0100)
Subject: archiver: Fix ASSUME_PROVIDED issues
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2279c6d20c2a33283ce9a8d1ef91a8acdad0a20e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

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: