sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: 329d864f9bbf94ad3aae8df43d63fe10e4237e4f)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2011-09-13 19:52:45 +08:00 committed by Richard Purdie
parent 3117530f44
commit 50e184e0d9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/multilib_global.bbclass
View File

@ -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

2
meta/conf/multilib.conf
View File

@ -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}"