mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 09:46:38 +01:00
418f160959
This patch is to ensure recipes get rebuilt correctly and avoid
incorrect sstate cache reuse when toggling multilib.
The following steps show one example of such incorrect sstate cache reuse.
1. enable multilib && bitbake <some_image> -c populate_sdk
2. disable multilib && bitbake <some_image> -c populate_sdk
The error message is as below:
Error:
Problem: conflicting requests
- nothing provides binutils-cross-canadian-i686 needed by packagegroup-cross-canadian-intel-x86-64-1.0-r0.x86_64_nativesdk
- nothing provides gcc-cross-canadian-i686 needed by packagegroup-cross-canadian-intel-x86-64-1.0-r0.x86_64_nativesdk
- nothing provides gdb-cross-canadian-i686 needed by packagegroup-cross-canadian-intel-x86-64-1.0-r0.x86_64_nativesdk
(try to add '--skip-broken' to skip uninstallable packages)
We get this error because packagegroup-cross-canadian recipe is
not rebuilt when it should be.
Current codes have tracked the dependency to MULTILIB_VARIANTS, as
shown in the following chain:
RDEPENDS:packagegroup-cross-canadian-intel-x86-64 ->
all_multilib_tune_values -> MULTILIB_VARIANTS.
However, MULTILIB_VARIANTS cannot automatically depend on MULTILIBS.
See some results from 'bitbake-dumpsigs' below:
List of dependencies for variable MULTILIB_VARIANTS is ['extend_variants']
Variable MULTILIB_VARIANTS value is ${@extend_variants(d,'MULTILIBS','multilib')}
It's obvious that the value of MULTILIB_VARIANTS depend on the
value of MULTILIBS, so let's set this dependency manually.
(From OE-Core rev: 9f47d8eb51816d16078a23c0cef4d697555f913f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.5 KiB
Plaintext
37 lines
1.5 KiB
Plaintext
|
|
baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}"
|
|
|
|
MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
|
|
MULTILIB_VARIANTS[vardeps] += "MULTILIBS"
|
|
MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR"
|
|
|
|
MULTILIBS ??= "multilib:lib32"
|
|
|
|
STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
|
|
STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
|
|
RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
|
|
RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot"
|
|
|
|
PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
|
|
|
|
INHERIT += "multilib_global"
|
|
|
|
BBCLASSEXTEND:append = " ${MULTILIBS}"
|
|
|
|
MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32"
|
|
|
|
OPKG_ARGS:append = " --force-maintainer --force-overwrite"
|
|
|
|
# When multilib is enabled, allarch recipes will be installed into the MACHINE
|
|
# sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to
|
|
# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks
|
|
# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's
|
|
# architecture-independent pkgconfig location to PKG_CONFIG_PATH.
|
|
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 ovmf u-boot"
|