aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-29 22:55:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-30 00:28:39 +0100
commit6bb70bd3857edb8cb6cc1317f57b899a89be2653 (patch)
tree4418f9706d8cec58eb8368407aea90b8fed95e96
parent52fd2993784b4218f5df4f343e7da45d964df305 (diff)
downloadopenembedded-core-contrib-6bb70bd3857edb8cb6cc1317f57b899a89be2653.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass2
1 files changed, 1 insertions, 1 deletions
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 ""