aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-01-31 13:31:04 -0500
committerRoss Burton <ross.burton@intel.com>2013-04-30 11:06:16 +0100
commit036bf4dd800147f18b9b1451061e7e7a794300a7 (patch)
tree0cc73fcfc0f665932f399d84e7b4d7ed0ace8278
parent18b401f4f8e931dca08a2e9be34e94c49b5215b9 (diff)
downloadopenembedded-core-036bf4dd800147f18b9b1451061e7e7a794300a7.zip
openembedded-core-036bf4dd800147f18b9b1451061e7e7a794300a7.tar.gz
openembedded-core-036bf4dd800147f18b9b1451061e7e7a794300a7.tar.bz2
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. 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>
-rw-r--r--meta/classes/multilib.bbclass4
-rw-r--r--meta/lib/oe/classextend.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 3824f3b..3f27196 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -10,7 +10,9 @@ python multilib_virtclass_handler () {
e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True))
# There should only be one kernel in multilib configs
- if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
+ # We also skip multilib setup for module packages.
+ provides = (e.data.getVar("PROVIDES", True) or "").split()
+ if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
if bb.data.inherits_class('image', e.data):
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index fe9b566..a45df3a 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -5,7 +5,7 @@ class ClassExtender(object):
self.pkgs_mapping = []
def extend_name(self, name):
- if name.startswith("kernel-module"):
+ if name.startswith("kernel-module") or name == "virtual/kernel":
return name
if name.startswith("rtld"):
return name