From 04e2dd9e0b86cddc976a0b296f54e15e5cd42dd7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Jun 2015 23:01:48 +0100 Subject: 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 --- meta/classes/multilib_global.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes') 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(): -- cgit v1.2.3-54-g00ecf