diff options
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r-- | meta/classes/multilib.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index db39e02d42..6c6499a23e 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -11,8 +11,12 @@ python multilib_virtclass_handler () { | |||
11 | # There should only be one kernel in multilib configs | 11 | # There should only be one kernel in multilib configs |
12 | # We also skip multilib setup for module packages. | 12 | # We also skip multilib setup for module packages. |
13 | provides = (e.data.getVar("PROVIDES") or "").split() | 13 | provides = (e.data.getVar("PROVIDES") or "").split() |
14 | if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data) or "make-mod-scripts" in e.data.getVar("PN"): | 14 | non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() |
15 | raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel") | 15 | bpn = e.data.getVar("BPN") |
16 | if "virtual/kernel" in provides or \ | ||
17 | bb.data.inherits_class('module-base', e.data) or \ | ||
18 | bpn in non_ml_recipes: | ||
19 | raise bb.parse.SkipRecipe("We shouldn't have multilib variants for %s" % bpn) | ||
16 | 20 | ||
17 | save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" | 21 | save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" |
18 | for name in save_var_name.split(): | 22 | for name in save_var_name.split(): |