diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/multilib.bbclass | 8 | ||||
-rw-r--r-- | meta/classes/multilib_global.bbclass | 5 |
2 files changed, 10 insertions, 3 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(): |
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 1bb62427b0..649cc096b7 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -164,8 +164,11 @@ python multilib_virtclass_handler_global () { | |||
164 | if variant: | 164 | if variant: |
165 | return | 165 | return |
166 | 166 | ||
167 | non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() | ||
168 | |||
167 | if bb.data.inherits_class('kernel', e.data) or \ | 169 | if bb.data.inherits_class('kernel', e.data) or \ |
168 | bb.data.inherits_class('module-base', e.data): | 170 | bb.data.inherits_class('module-base', e.data) or \ |
171 | d.getVar('BPN') in non_ml_recipes: | ||
169 | variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() | 172 | variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() |
170 | 173 | ||
171 | import oe.classextend | 174 | import oe.classextend |