diff mbox series

[v2] kernel.bbclass: Handle possible multiconfig.

Message ID 20250218140605.3954876-1-daniel.mueller@karlstorz.com
State New
Headers show
Series [v2] kernel.bbclass: Handle possible multiconfig. | expand

Commit Message

Mueller, Daniel Feb. 18, 2025, 1:54 p.m. UTC 
From: Sebastian Zenker <sebastian.zenker@gmx.de>

When specifying the dependencies of do_bundle_initramfs the current
multiconfig might not be the default. This fixes the dependencies between
the multiconfigs if the current differs to default.

Signed-off-by: Mueller, Daniel <daniel.mueller@karlstorz.com>
---
Your right, handling 'default' isn't required anymore, my apologies. I've
reworked the changes and tested them against the master branch.

Please also ignore the other 2 patches of the original patchset, those
have been been integrated into master already.

Regards, Daniel
 meta/classes-recipe/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 617727a989..6fe7c60e17 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -146,7 +146,7 @@  set -e
     # standalone for use by wic and other tools.
     if image:
         if d.getVar('INITRAMFS_MULTICONFIG'):
-            d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc::${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete')
+            d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:${BB_CURRENT_MC}:${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete')
         else:
             d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
     if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):