[PATCH 0/3] Fix incorrect dependencies between multiconfigs

[PATCH 0/3] Fix incorrect dependencies between multiconfigs

[Mueller, Daniel]

This branch fixes some incorrect initramfs dependency handling between
multiconfigs in case the current multiconfig isn't the default.

It also removes the dependency between fitImage and initramfs in case
the initramfs is already bundled within the kernel.

Sebastian Zenker (1):
  kernel.bbclass: Handle possible multiconfig.

Weisser, Pascal (2):
  kernel-fitImage.bbclass: Handle possible multiconfig.
  kernel-fitImage.bbclass: Remove dependeny on initramfs image when
    bundled.

 meta/classes-recipe/kernel-fitimage.bbclass | 12 +++++++++---
 meta/classes-recipe/kernel.bbclass          |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

[PATCH 1/3] kernel.bbclass: Handle possible multiconfig.

[Mueller, Daniel]

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>
---
 meta/classes-recipe/kernel.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 617727a989..9276ddb62a 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -146,7 +146,10 @@ 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')
+            mc = d.getVar('BB_CURRENT_MC')
+            if mc == 'default':
+                mc = ''
+            d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:' + 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')):

Re: [OE-core] [PATCH 1/3] kernel.bbclass: Handle possible multiconfig.

[Richard Purdie]

On Thu, 2025-02-06 at 15:22 +0100, Mueller, Daniel via lists.openembedded.org wrote:
> 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>
> ---
>  meta/classes-recipe/kernel.bbclass | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
> index 617727a989..9276ddb62a 100644
> --- a/meta/classes-recipe/kernel.bbclass
> +++ b/meta/classes-recipe/kernel.bbclass
> @@ -146,7 +146,10 @@ 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')
> +            mc = d.getVar('BB_CURRENT_MC')
> +            if mc == 'default':
> +                mc = ''
> +            d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:' + 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')):

The "default" value in multiconfig was recently removed entirely so
this patch is not needed for master. This does raise questions of how
it was tested.

Cheers,

Richard

Re: [PATCH v2] kernel.bbclass: Handle possible multiconfig.

[Mueller, Daniel]

[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]

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 --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')):

[-- Attachment #2: Type: text/html, Size: 1892 bytes --]

[PATCH 2/3] kernel-fitImage.bbclass: Handle possible multiconfig.

[Mueller, Daniel]

From: "Weisser, Pascal" <pascal.weisser.ext@karlstorz.com>

When specifying the dependencies of do_assemble_fitimage_initramfs the
initramfs image might be built with another multiconfig. This needs to be
handled.

The path of the initramfs image also needs to be adapted to handle the
case when it's built with another multiconfig.

Signed-off-by: Mueller, Daniel <daniel.mueller@karlstorz.com>
---
 meta/classes-recipe/kernel-fitimage.bbclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index fe076badfa..48110a76d0 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -39,7 +39,13 @@ 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')
+            if mc == 'default':
+                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')
 
     ubootenv = d.getVar('UBOOT_ENV')
     if ubootenv:
@@ -632,7 +638,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

[PATCH 3/3] kernel-fitImage.bbclass: Remove dependeny on initramfs image when bundled.

[Mueller, Daniel]

From: "Weisser, Pascal" <pascal.weisser.ext@karlstorz.com>

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: Mueller, Daniel <daniel.mueller@karlstorz.com>
---
 meta/classes-recipe/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 48110a76d0..11fbe6d453 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')
             if mc == 'default':

[PATCH v2] kernel.bbclass: Handle possible multiconfig.

[Mueller, Daniel]

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 --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')):