summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_global.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-09-29 15:23:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-01 13:04:49 +0100
commita1fd97e1c7fda0fc2813aa8360972cfe69092ccd (patch)
tree7153bd88e333621616380b2412f51f45e855db40 /meta/classes/multilib_global.bbclass
parentf7198b473f2c9100262fe8129693d06b3358786c (diff)
downloadpoky-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_global.bbclass')
-rw-r--r--meta/classes/multilib_global.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 1bb62427b0..649cc096b7 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -164,8 +164,11 @@ python multilib_virtclass_handler_global () {
164 if variant: 164 if variant:
165 return 165 return
166 166
167 non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split()
168
167 if bb.data.inherits_class('kernel', e.data) or \ 169 if bb.data.inherits_class('kernel', e.data) or \
168 bb.data.inherits_class('module-base', e.data): 170 bb.data.inherits_class('module-base', e.data) or \
171 d.getVar('BPN') in non_ml_recipes:
169 variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() 172 variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
170 173
171 import oe.classextend 174 import oe.classextend