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:44 +0100 |
| commit | 25f7c6c329038b443d36074fff45a30ba3712f7a (patch) | |
| tree | 83e491c5490eab4abf922a4887706ef0aeee8323 /meta | |
| parent | 72c37b06b034e97e7dd7e1a20fb0ff5f96088440 (diff) | |
| download | openembedded-core-contrib-25f7c6c329038b443d36074fff45a30ba3712f7a.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/multilib.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 4 |
3 files changed, 14 insertions, 3 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 () { # 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) or "make-mod-scripts" in e.data.getVar("PN"): - raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel") + non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() + bpn = e.data.getVar("BPN") + if "virtual/kernel" in provides or \ + bb.data.inherits_class('module-base', e.data) or \ + bpn in non_ml_recipes: + raise bb.parse.SkipRecipe("We shouldn't have multilib variants for %s" % bpn) save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" for name in save_var_name.split(): 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 () { if variant: return + non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() + if bb.data.inherits_class('kernel', e.data) or \ - bb.data.inherits_class('module-base', e.data): + bb.data.inherits_class('module-base', e.data) or \ + d.getVar('BPN') in non_ml_recipes: variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() import oe.classextend diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index e74dec81a8..65a28ddbd2 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -26,3 +26,7 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite" PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" + +# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES +# ${MLPREFIX}${BPN} +NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts" |