From 2fb5d93afb78107047903b1aa9dd0d4a8deec6f3 Mon Sep 17 00:00:00 2001 From: "Weisser, Pascal.ext" Date: Thu, 6 Feb 2025 09:26:56 +0100 Subject: [PATCH] kernel-fitImage: Take possible multiconfig into account. When specifying the dependencies of do_assemble_fitimage_initramfs the initramfs image might be built with another multiconfig. This needs to be taken into account. The path of the initramfs image also needs to be adapted to handle the case when it's built with another multiconfig. (From OE-Core rev: 891d58e9dc00e52f17ddecd4f12fc81c8a3c1bce) Signed-off-by: Weisser, Pascal Signed-off-by: Richard Purdie --- meta/classes-recipe/kernel-fitimage.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 22356fe567..5f1231fde3 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -39,7 +39,11 @@ python __anonymous () { image = d.getVar('INITRAMFS_IMAGE') if image: - d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') + if d.getVar('INITRAMFS_MULTICONFIG'): + mc = d.getVar('BB_CURRENT_MC') + d.appendVarFlag('do_assemble_fitimage_initramfs', 'mcdepends', ' mc:' + mc + ':${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete') + else: + d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') #check if there are any dtb providers providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb") @@ -624,7 +628,7 @@ fitimage_assemble() { # Find and use the first initramfs image archive type we find found= for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do - initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" + initramfs_path="${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" if [ -e "$initramfs_path" ]; then bbnote "Found initramfs image: $initramfs_path" found=true