multilib: avoid expanding grub and grub-efi to multilib
cover multilib: avoid expanding grub and grub-efi to multilib
The following changes since commit 4dad1568f8f84ec9de4bf7235822f77a8ee6a413:
glibc-package.inc: correct intention for deleting /usr/lib as needed (2018-09-27 23:39:28 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/multilib
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/multilib
Robert Yang (1):
multilib: avoid expanding grub and grub-efi to multilib
meta/classes/multilib.bbclass | 8 ++++++-- meta/classes/multilib_global.bbclass | 5 ++++- meta/conf/multilib.conf | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/1 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.
--- meta/classes/multilib.bbclass | 8 ++++++-- meta/classes/multilib_global.bbclass | 5 ++++- meta/conf/multilib.conf | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-)
meta/classes/multilib.bbclass +6 -2
@@ -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():
meta/classes/multilib_global.bbclass +4 -1
@@ -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
meta/conf/multilib.conf +4 -0
@@ -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"
Signature · 1 line
2.7.4