[oe-commits] [openembedded-core] 09/10: multilib: Don't extend make-mod-scripts as a multilib version doesn't make any sense

git at git.openembedded.org git at git.openembedded.org
Thu Mar 29 23:32:13 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 6bb70bd3857edb8cb6cc1317f57b899a89be2653
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Mar 29 22:55:26 2018 +0100

    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 at linuxfoundation.org>
---
 meta/classes/multilib.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index fbb6980..519c1a5 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 ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list