From 6b96d9ff7388087b70cdcd3f1fc566affc1de86c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 29 Mar 2018 22:55:26 +0100 Subject: multilib: Don't extend make-mod-scripts as a multilib version doesn't make any sense The multilib version would race against then non-ml version leading to all kinds of odd build failures. (From OE-Core rev: 6bb70bd3857edb8cb6cc1317f57b899a89be2653) Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index fbb69807d4..519c1a55ba 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -11,7 +11,7 @@ python multilib_virtclass_handler () { # There should only be one kernel in multilib configs # We also skip multilib setup for module packages. provides = (e.data.getVar("PROVIDES") or "").split() - if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): + if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data) or "make-mod-scripts" in e.data.getVar("PN"): raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel") save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" -- cgit v1.2.3-54-g00ecf