From: Weisser, Pascal.ext <Pascal.Weisser.ext@karlstorz.com>
Date: Thu, 6 Feb 2025 08:26:57 +0000 (+0100)
Subject: kernel-fitImage: Remove dependeny on initramfs image when bundled.
X-Git-Tag: uninative-4.7~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6cde746f72be761550ee28b017719fba26ea65;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

kernel-fitImage: Remove dependeny on initramfs image when bundled.

In case the initramfs image is bundled into the kernel there's no need to
specify a dependeny on the do_image_complete task of the initramfs image
from the do_assemble_fitimage_initramfs task since the task won't access
the image.

Signed-off-by: Weisser, Pascal <pascal.weisser.ext@karlstorz.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 5f1231fde37..f41509d308a 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -38,7 +38,7 @@ python __anonymous () {
         d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT')))
 
     image = d.getVar('INITRAMFS_IMAGE')
-    if image:
+    if image and not bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
         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')