summaryrefslogtreecommitdiffstats
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:13 +0100
commit50e184e0d9d7b38a08f979286eb65cd73d295f13 (patch)
tree688b54cfb48619456608294ba936f92a124a880a
parent3117530f4463ae056a5772eaf7b3f1a7fbb31011 (diff)
downloadpoky-50e184e0d9d7b38a08f979286eb65cd73d295f13.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] (From OE-Core rev: 329d864f9bbf94ad3aae8df43d63fe10e4237e4f) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib_global.bbclass4
-rw-r--r--meta/conf/multilib.conf2
2 files changed, 4 insertions, 2 deletions
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 () {
7 if isinstance(e, bb.event.RecipeParsed) and not variant: 7 if isinstance(e, bb.event.RecipeParsed) and not variant:
8 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): 8 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):
9 origprovs = provs = e.data.getVar("PROVIDES", True) 9 origprovs = provs = e.data.getVar("PROVIDES", True)
10 rprovs = e.data.getVar("RPROVIDES", True)
10 variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split() 11 variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
11 for variant in variants: 12 for variant in variants:
12 provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data) 13 provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
14 for pkg in e.data.getVar("PACKAGES", True).split():
15 rprovs = rprovs + " " + variant + "-" + pkg
13 e.data.setVar("PROVIDES", origprovs) 16 e.data.setVar("PROVIDES", origprovs)
14 e.data.setVar("PROVIDES", provs) 17 e.data.setVar("PROVIDES", provs)
18 e.data.setVar("RPROVIDES", rprovs)
15} 19}
16 20
17addhandler multilib_virtclass_handler_global 21addhandler multilib_virtclass_handler_global
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index f23fbb7b59..16db37548a 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -324,7 +324,6 @@ BBCLASSEXTEND_append_pn-psplash = " ${MULTILIBS}"
324BBCLASSEXTEND_append_pn-pth = " ${MULTILIBS}" 324BBCLASSEXTEND_append_pn-pth = " ${MULTILIBS}"
325BBCLASSEXTEND_append_pn-python-dbus = " ${MULTILIBS}" 325BBCLASSEXTEND_append_pn-python-dbus = " ${MULTILIBS}"
326BBCLASSEXTEND_append_pn-python = " ${MULTILIBS}" 326BBCLASSEXTEND_append_pn-python = " ${MULTILIBS}"
327BBCLASSEXTEND_append_pn-qemu-config = " ${MULTILIBS}"
328BBCLASSEXTEND_append_pn-qemugl = " ${MULTILIBS}" 327BBCLASSEXTEND_append_pn-qemugl = " ${MULTILIBS}"
329BBCLASSEXTEND_append_pn-qt4-x11-free = " ${MULTILIBS}" 328BBCLASSEXTEND_append_pn-qt4-x11-free = " ${MULTILIBS}"
330BBCLASSEXTEND_append_pn-quota = " ${MULTILIBS}" 329BBCLASSEXTEND_append_pn-quota = " ${MULTILIBS}"
@@ -394,7 +393,6 @@ BBCLASSEXTEND_append_pn-udev-extraconf = " ${MULTILIBS}"
394BBCLASSEXTEND_append_pn-udev = " ${MULTILIBS}" 393BBCLASSEXTEND_append_pn-udev = " ${MULTILIBS}"
395BBCLASSEXTEND_append_pn-unzip = " ${MULTILIBS}" 394BBCLASSEXTEND_append_pn-unzip = " ${MULTILIBS}"
396BBCLASSEXTEND_append_pn-update-modules = " ${MULTILIBS}" 395BBCLASSEXTEND_append_pn-update-modules = " ${MULTILIBS}"
397BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}"
398BBCLASSEXTEND_append_pn-usbutils = " ${MULTILIBS}" 396BBCLASSEXTEND_append_pn-usbutils = " ${MULTILIBS}"
399BBCLASSEXTEND_append_pn-util-linux = " ${MULTILIBS}" 397BBCLASSEXTEND_append_pn-util-linux = " ${MULTILIBS}"
400BBCLASSEXTEND_append_pn-util-macros = " ${MULTILIBS}" 398BBCLASSEXTEND_append_pn-util-macros = " ${MULTILIBS}"