diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:01:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-16 14:21:29 +0100 |
commit | 04e2dd9e0b86cddc976a0b296f54e15e5cd42dd7 (patch) | |
tree | ee1aa454e6e8decbb0c8ce5b0bf805a4d1f95dc8 /meta/classes | |
parent | af377d6e0c3a0008af2ed1388f931d62206fb077 (diff) | |
download | poky-04e2dd9e0b86cddc976a0b296f54e15e5cd42dd7.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.
(From OE-Core rev: fe10ea6bd6078828016d3954ad9b290f638d6dbb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/multilib_global.bbclass | 3 |
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 () { | |||
142 | origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or "" | 142 | origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or "" |
143 | for clsextend in clsextends: | 143 | for clsextend in clsextends: |
144 | rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False) | 144 | rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False) |
145 | e.data.setVar("RPROVIDES", rprovs) | 145 | if rprovs.strip(): |
146 | e.data.setVar("RPROVIDES", rprovs) | ||
146 | 147 | ||
147 | # Process RPROVIDES_${PN}... | 148 | # Process RPROVIDES_${PN}... |
148 | for pkg in (e.data.getVar("PACKAGES", True) or "").split(): | 149 | for pkg in (e.data.getVar("PACKAGES", True) or "").split(): |