From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 25 May 2015 07:52:22 +0000 (+0100)
Subject: native: Improve PROVIDES handling
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe405a49689a6be7c021f053d1fcca533f7d2070;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

native: Improve PROVIDES handling

Since this class works on pre finalised data, the logic hasn't needed
to be exact. If we change the way the finalised data works, we find
that certain dependencies can be dropped (e.g. pn isn't in the name).

To fix this, restructure the function to alter each entry in turn
and not drop any entries.

(From OE-Core rev: 4434977ccb95f8f366ba133366093b8c7ef1f718)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 1f8139bec86..71b05720f20 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -154,9 +154,11 @@ python native_virtclass_handler () {
     nprovides = []
     for prov in provides.split():
         if prov.find(pn) != -1:
-            continue
-        if not prov.endswith("-native"):
+            nprovides.append(prov)
+        elif not prov.endswith("-native"):
             nprovides.append(prov.replace(prov, prov + "-native"))
+        else:
+            nprovides.append(prov)
     e.data.setVar("PROVIDES", ' '.join(nprovides))
 
     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")