mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
allarch: only enable allarch when multilib is not used
Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g. core-image-sato -> ca-certificates(allarch) -> openssl we expect dependency chain for lib32-core-image-sato: lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl it should install lib32-openssl for ca-certificates but openssl is still wrongly required. Only enable allarch when multilib is not used to fix the issue. (From OE-Core rev: a23c482cab4f874f4a6a6889716123569eb5ece9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -2,7 +2,18 @@
|
||||
# This class is used for architecture independent recipes/data files (usually scripts)
|
||||
#
|
||||
|
||||
PACKAGE_ARCH = "all"
|
||||
python allarch_package_arch_handler () {
|
||||
if bb.data.inherits_class("native", d) or bb.data.inherits_class("nativesdk", d) \
|
||||
or bb.data.inherits_class("crosssdk", d):
|
||||
return
|
||||
|
||||
variants = d.getVar("MULTILIB_VARIANTS")
|
||||
if not variants:
|
||||
d.setVar("PACKAGE_ARCH", "all" )
|
||||
}
|
||||
|
||||
addhandler allarch_package_arch_handler
|
||||
allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"
|
||||
|
||||
python () {
|
||||
# Allow this class to be included but overridden - only set
|
||||
|
||||
Reference in New Issue
Block a user