From 65ec98511e52f60ddf868a206536893dbe5f2839 Mon Sep 17 00:00:00 2001 From: Joao Marcos Costa Date: Wed, 27 Dec 2023 17:24:41 +0100 Subject: imx-base.inc: fix WKS_FILE_DEPENDS's override Using 'aarch64', as if the WKS_FILE_DEPENDS was conditioned to the userspace's architecture, will not include imx-boot in a multilib context (e.g., for a 32-bit userspace). This happens because 'aarch64' will not be listed in OVERRIDES, and the error below will come up during do_image_wic task: wic.filemap.Error: cannot open image file '.../build/tmp-glibc/deploy/images/microej-imx93/imx-boot': [Errno 2] No such file or directory Replace 'aarch64' by mx*-generic-bsp, for both imx8 and imx9, as these two are aarch64 platforms. Signed-off-by: Joao Marcos Costa --- conf/machine/include/imx-base.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 17d3f7711..ad74a2eaa 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -651,7 +651,10 @@ WKS_FILE_DEPENDS ?= " \ # # NOTE: the results binary name of the boot container is set to 'imx-boot' # for both NXP and Mainline BSP. -WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ +WKS_FILE_DEPENDS:append:imx-generic-bsp:mx8-generic-bsp = " \ + ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ +" +WKS_FILE_DEPENDS:append:imx-generic-bsp:mx9-generic-bsp = " \ ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ " -- cgit v1.2.3-54-g00ecf