summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
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:31:18 +0100
commit6b96d9ff7388087b70cdcd3f1fc566affc1de86c (patch)
tree86e2a2182c8318b3ee08572ac6153729c1a9ee0e /meta/classes/multilib.bbclass
parent0f85563eacf5138d98b826343cdfc3833d1c5c8e (diff)
downloadpoky-6b96d9ff7388087b70cdcd3f1fc566affc1de86c.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. (From OE-Core rev: 6bb70bd3857edb8cb6cc1317f57b899a89be2653) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-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 () {
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): 14 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data) or "make-mod-scripts" in e.data.getVar("PN"):
15 raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel") 15 raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel")
16 16
17 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" 17 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or ""