aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_global.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:01:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-16 14:20:17 +0100
commitfe10ea6bd6078828016d3954ad9b290f638d6dbb (patch)
tree27b41d841ba0ecbcc464386a96796a554ee0f4f2 /meta/classes/multilib_global.bbclass
parent59ca90114fb0b770d9d79e548b7e52aa0c089e48 (diff)
downloadopenembedded-core-contrib-fe10ea6bd6078828016d3954ad9b290f638d6dbb.tar.gz
multilib_global: Stop empty space influencing RPROVIDES
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@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r--meta/classes/multilib_global.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 8ea2a5a4b8..67bd70d293 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():