From 329d864f9bbf94ad3aae8df43d63fe10e4237e4f Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 13 Sep 2011 19:52:45 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/multilib_global.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/multilib_global.bbclass') diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 1263e4ea82..ed14565a64 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 -- cgit 1.2.3-korg