aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_global.bbclass
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-13 19:52:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-13 17:08:07 +0100
commit329d864f9bbf94ad3aae8df43d63fe10e4237e4f (patch)
tree24e564c3a93ea48cbfcf027af00a566ee40266a5 /meta/classes/multilib_global.bbclass
parent90ad70fe13a9f8409387ca70289998bdca649aeb (diff)
downloadopenembedded-core-contrib-329d864f9bbf94ad3aae8df43d63fe10e4237e4f.tar.gz
multilib: Remove recipe from multilib.conf that inherits allarch
Recipes like update-rc.d and qemu-config inherit "allarch", thus we shouldn't add multilib BBCLASSEXTEND for them in multilib.conf. Besides, we need to add multilib packages as the RPROVIDER contents for those recipes, in order to avoid the NoProvider error when parsing. [YOCTO #1471] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r--meta/classes/multilib_global.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 1263e4ea829..ed14565a64f 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -7,11 +7,15 @@ python multilib_virtclass_handler_global () {
if isinstance(e, bb.event.RecipeParsed) and not variant:
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
origprovs = provs = e.data.getVar("PROVIDES", True)
+ rprovs = e.data.getVar("RPROVIDES", True)
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
for variant in variants:
provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
+ for pkg in e.data.getVar("PACKAGES", True).split():
+ rprovs = rprovs + " " + variant + "-" + pkg
e.data.setVar("PROVIDES", origprovs)
e.data.setVar("PROVIDES", provs)
+ e.data.setVar("RPROVIDES", rprovs)
}
addhandler multilib_virtclass_handler_global