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/conf | |
| 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/conf')
| -rw-r--r-- | meta/conf/multilib.conf | 4 |
1 files changed, 4 insertions, 0 deletions
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" | |||
| 26 | PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" | 26 | PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" |
| 27 | PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" | 27 | PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" |
| 28 | PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" | 28 | PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" |
| 29 | |||
| 30 | # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES | ||
| 31 | # ${MLPREFIX}${BPN} | ||
| 32 | NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts" | ||