[oe-commits] Dongxiao Xu : multilib: Remove recipe from multilib. conf that inherits allarch
git version control
git at git.openembedded.org
Tue Sep 13 16:08:17 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 329d864f9bbf94ad3aae8df43d63fe10e4237e4f
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=329d864f9bbf94ad3aae8df43d63fe10e4237e4f
Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date: Tue Sep 13 19:52:45 2011 +0800
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/multilib_global.bbclass | 4 ++++
meta/conf/multilib.conf | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 1263e4e..ed14565 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
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index f23fbb7..16db375 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -324,7 +324,6 @@ BBCLASSEXTEND_append_pn-psplash = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-pth = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-python-dbus = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-python = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-qemu-config = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-qemugl = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-qt4-x11-free = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-quota = " ${MULTILIBS}"
@@ -394,7 +393,6 @@ BBCLASSEXTEND_append_pn-udev-extraconf = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-udev = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-unzip = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-update-modules = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-usbutils = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-util-linux = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-util-macros = " ${MULTILIBS}"
More information about the Openembedded-commits
mailing list