diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-09-29 15:23:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-01 13:04:49 +0100 |
commit | a1fd97e1c7fda0fc2813aa8360972cfe69092ccd (patch) | |
tree | 7153bd88e333621616380b2412f51f45e855db40 /meta/classes/multilib.bbclass | |
parent | f7198b473f2c9100262fe8129693d06b3358786c (diff) | |
download | poky-a1fd97e1c7fda0fc2813aa8360972cfe69092ccd.tar.gz |
multilib: avoid expanding grub and grub-efi to multilib
It doesn't make much sense to expand them to multilib, and there is an error on
qemuarm64 since grub-efi supports arm64, but doesn't support armv7a or armv7ve:
* Fixed:
MACHINE = "qemuarm64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7a"
MACHINE_FEATURES_append = " efi"
$ bitbake lib32-core-image-minimal
Also introduced a variable NON_MULTILIB_RECIPES in multilib.conf, so that we
can easily add other recipes, such as syslinux if needed.
(From OE-Core rev: 25f7c6c329038b443d36074fff45a30ba3712f7a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r-- | meta/classes/multilib.bbclass | 8 |
1 files changed, 6 insertions, 2 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(): |