diff options
| -rw-r--r-- | meta/classes/multilib.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oe/classextend.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 3824f3b117..3f271960b3 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 fe9b566e7c..a45df3a98b 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 |