[OE-core] [PATCH] multilib_global: Stop empty space influencing RPROVIDES

Richard Purdie richard.purdie at linuxfoundation.org
Thu Jun 11 22:01:48 UTC 2015


If the resulting RPROVIDES is empty, don't set it. This streamlines
pkgdata slightly removing empty values and avoids other errors which
confuse the datastore when the variable is best left unset.

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

diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 8ea2a5a..67bd70d 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -142,7 +142,8 @@ python multilib_virtclass_handler_global () {
             origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
             for clsextend in clsextends:
                 rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False)
-            e.data.setVar("RPROVIDES", rprovs)
+            if rprovs.strip():
+                e.data.setVar("RPROVIDES", rprovs)
 
 	    # Process RPROVIDES_${PN}...
             for pkg in (e.data.getVar("PACKAGES", True) or "").split():





More information about the Openembedded-core mailing list