summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-01-31 13:31:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:00 +0000
commit12e76e123f66c36910f1fadece620024b2264a26 (patch)
tree4a649948e24678915648e2089968019c1f61de21 /meta/classes
parentdbfa6f9563cb79a9c3db4a0f0c8c503fa3b3f29f (diff)
downloadpoky-12e76e123f66c36910f1fadece620024b2264a26.tar.gz
multilib: skip packages that provide virtual/kernel
Rather than keying on recipes that inherit kernel.bbclass, we should be checking for providers of virtual/kernel when skipping kernel recipes in multlib builds. Not all providers of virtual/kernel inherit kernel.bbclass (notably linux-dummy), so checking on the provider is a more complete check. We need to be sure to check for inheritance of module-base as well, this allows for packages that provides modules to avoid the multilib renaming. (From OE-Core rev: dc7d181ab03ceab87a24d932130109003334dbf8) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/multilib.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index f5f3c69363..f1696b6b7c 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -10,7 +10,9 @@ python multilib_virtclass_handler () {
10 e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True)) 10 e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True))
11 11
12 # There should only be one kernel in multilib configs 12 # There should only be one kernel in multilib configs
13 if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data): 13 # We also skip multilib setup for module packages.
14 provides = (e.data.getVar("PROVIDES", True) or "").split()
15 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
14 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") 16 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
15 17
16 if bb.data.inherits_class('image', e.data): 18 if bb.data.inherits_class('image', e.data):