[wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[Marek Vasut]

The OE 5.0 implementation of fitImage generation did not include the
kernel property in DTBO configuration node subnodes, while the current
OE 6.0 implementation does. The previous implementation was correct,
because kernel together with only a DTBO overlay can not form bootable
result. The kernel property should only be part of the configuration
subnode which includes both kernel and DTB. Fix this.

Fixes: 05d0c7342d76 ("kernel-fit-image.bbclass: add a new FIT image implementation")
Signed-off-by: Marek Vasut <marek.vasut@mailbox.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 06ed34005957a6afb88270603df5e545941546b0)
---
Cc: Adrian Freihofer <adrian.freihofer@siemens.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Yoann Congal <yoann.congal@smile.fr>
---
 meta/lib/oe/fitimage.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/fitimage.py b/meta/lib/oe/fitimage.py
index 881d0eae0ab..d7e21171ab9 100644
--- a/meta/lib/oe/fitimage.py
+++ b/meta/lib/oe/fitimage.py
@@ -425,8 +425,13 @@ class ItsNodeRootKernel(ItsNode):
         opt_props = {}
         conf_desc = []
         sign_entries = []
+        include_kernel = 1
 
-        if self._kernel:
+        # DTBO configuration sections do not include kernel property
+        if dtb and os.path.splitext(dtb.name)[1] == ".dtbo":
+            include_kernel = 0
+
+        if self._kernel and include_kernel:
             conf_desc.append("Linux kernel")
             opt_props["kernel"] = self._kernel.name
             if self._sign_enable:
-- 
2.53.0

Re: [wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[Freihofer, Adrian]

Hi Marek

I guess, before this patch can be applied, this one (or a back-port of
it) is required:
https://git.openembedded.org/openembedded-core/commit/?id=85e0408a81bdca0411a8625061e5e343c05f92d9
Otherwise, the oe-selftest fail.

Regards,
Adrian


On Tue, 2026-06-30 at 09:43 +0200, Marek Vasut wrote:
> The OE 5.0 implementation of fitImage generation did not include the
> kernel property in DTBO configuration node subnodes, while the
> current
> OE 6.0 implementation does. The previous implementation was correct,
> because kernel together with only a DTBO overlay can not form
> bootable
> result. The kernel property should only be part of the configuration
> subnode which includes both kernel and DTB. Fix this.
> 
> Fixes: 05d0c7342d76 ("kernel-fit-image.bbclass: add a new FIT image
> implementation")
> Signed-off-by: Marek Vasut <marek.vasut@mailbox.org>
> Signed-off-by: Mathieu Dubois-Briand
> <mathieu.dubois-briand@bootlin.com>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 06ed34005957a6afb88270603df5e545941546b0)
> ---
> Cc: Adrian Freihofer <adrian.freihofer@siemens.com>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cc: Yoann Congal <yoann.congal@smile.fr>
> ---
>  meta/lib/oe/fitimage.py | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/lib/oe/fitimage.py b/meta/lib/oe/fitimage.py
> index 881d0eae0ab..d7e21171ab9 100644
> --- a/meta/lib/oe/fitimage.py
> +++ b/meta/lib/oe/fitimage.py
> @@ -425,8 +425,13 @@ class ItsNodeRootKernel(ItsNode):
>          opt_props = {}
>          conf_desc = []
>          sign_entries = []
> +        include_kernel = 1
>  
> -        if self._kernel:
> +        # DTBO configuration sections do not include kernel property
> +        if dtb and os.path.splitext(dtb.name)[1] == ".dtbo":
> +            include_kernel = 0
> +
> +        if self._kernel and include_kernel:
>              conf_desc.append("Linux kernel")
>              opt_props["kernel"] = self._kernel.name
>              if self._sign_enable:

Re: [wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[Marek Vasut]

On 6/30/26 12:51 PM, Freihofer, Adrian wrote:

Hello Adrian,

> I guess, before this patch can be applied, this one (or a back-port of
> it) is required:
> https://git.openembedded.org/openembedded-core/commit/?id=85e0408a81bdca0411a8625061e5e343c05f92d9
> Otherwise, the oe-selftest fail.
Thank you for staying vigilant.

Yoann, can you please pick the aforementioned commit too ?

Thank you for your help !

Re: [wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[Yoann Congal]

On Tue Jun 30, 2026 at 2:58 PM CEST, Marek Vasut wrote:
> On 6/30/26 12:51 PM, Freihofer, Adrian wrote:
>
> Hello Adrian,
>
>> I guess, before this patch can be applied, this one (or a back-port of
>> it) is required:
>> https://git.openembedded.org/openembedded-core/commit/?id=85e0408a81bdca0411a8625061e5e343c05f92d9
>> Otherwise, the oe-selftest fail.
> Thank you for staying vigilant.
>
> Yoann, can you please pick the aforementioned commit too ?
>
> Thank you for your help !

Hello,

I missed that discussion, sorry. But was reminded by Ryan (thanks).

If I understood correclty, the set of patches we need for wrynose is:
* kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes
* kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED = "1"
* oe-selftest: fitimage: Do not expect kernel property in DTBO config subnodes
* kernel-fit-image: Add KERNEL_DTBVENDORED support for FIT_CONF_DEFAULT_DTB (this one is not merged on master yet)

Marek, Adrian, Ryan: does that sound correct?

If yes, Marek, when the 4th patch merge, can you send an updated series
with all 4 backport patches?

Thanks!
-- 
Yoann Congal
Smile ECS

Re: [OE-core] [wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[adrian.freihofer]

On Thu, 2026-07-02 at 13:26 +0200, Yoann Congal via
lists.openembedded.org wrote:
> On Tue Jun 30, 2026 at 2:58 PM CEST, Marek Vasut wrote:
> > On 6/30/26 12:51 PM, Freihofer, Adrian wrote:
> > 
> > Hello Adrian,
> > 
> > > I guess, before this patch can be applied, this one (or a back-
> > > port of
> > > it) is required:
> > > https://git.openembedded.org/openembedded-core/commit/?id=85e0408a81bdca0411a8625061e5e343c05f92d9
> > > Otherwise, the oe-selftest fail.
> > Thank you for staying vigilant.
> > 
> > Yoann, can you please pick the aforementioned commit too ?
> > 
> > Thank you for your help !
> 
> Hello,
> 
> I missed that discussion, sorry. But was reminded by Ryan (thanks).
> 
> If I understood correclty, the set of patches we need for wrynose is:
> * kernel-fit-image.bbclass: Do not include kernel property in DTBO
> config subnodes
> * kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED =
> "1"
> * oe-selftest: fitimage: Do not expect kernel property in DTBO config
> subnodes
> * kernel-fit-image: Add KERNEL_DTBVENDORED support for
> FIT_CONF_DEFAULT_DTB (this one is not merged on master yet)
> 
> Marek, Adrian, Ryan: does that sound correct?
> 

Yes, that's correct. One little detail is the order of the patches. If
you pick the oe-selftest commit first, all commits are compile and
test-able. That's my suggestion:

 * oe-selftest: fitimage: Do not expect kernel property in DTBO config
subnodes
 * kernel-fit-image.bbclass: Do not include kernel property in DTBO
config subnodes
 * kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED =
"1"
 * kernel-fit-image: Add KERNEL_DTBVENDORED support for
FIT_CONF_DEFAULT_DTB (this one is not merged on master yet)

same order as on master branch.

Regards,
Adrian


> If yes, Marek, when the 4th patch merge, can you send an updated
> series
> with all 4 backport patches?
> 
> Thanks!
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#240033):
> https://lists.openembedded.org/g/openembedded-core/message/240033
> Mute This Topic: https://lists.openembedded.org/mt/120043543/4454582
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe:
> https://lists.openembedded.org/g/openembedded-core/unsub [
> adrian.freihofer@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [wrynose][PATCH] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

[Marek Vasut]

On 7/2/26 1:38 PM, adrian.freihofer@gmail.com wrote:

Hello everyone,

>>>> I guess, before this patch can be applied, this one (or a back-
>>>> port of
>>>> it) is required:
>>>> https://git.openembedded.org/openembedded-core/commit/?id=85e0408a81bdca0411a8625061e5e343c05f92d9
>>>> Otherwise, the oe-selftest fail.
>>> Thank you for staying vigilant.
>>>
>>> Yoann, can you please pick the aforementioned commit too ?
>>>
>>> Thank you for your help !
>>
>> Hello,
>>
>> I missed that discussion, sorry. But was reminded by Ryan (thanks).
>>
>> If I understood correclty, the set of patches we need for wrynose is:
>> * kernel-fit-image.bbclass: Do not include kernel property in DTBO
>> config subnodes
>> * kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED =
>> "1"
>> * oe-selftest: fitimage: Do not expect kernel property in DTBO config
>> subnodes
>> * kernel-fit-image: Add KERNEL_DTBVENDORED support for
>> FIT_CONF_DEFAULT_DTB (this one is not merged on master yet)
>>
>> Marek, Adrian, Ryan: does that sound correct?
>>
> 
> Yes, that's correct. One little detail is the order of the patches. If
> you pick the oe-selftest commit first, all commits are compile and
> test-able. That's my suggestion:
> 
>   * oe-selftest: fitimage: Do not expect kernel property in DTBO config
> subnodes

This is [1].

>   * kernel-fit-image.bbclass: Do not include kernel property in DTBO
> config subnodes

This is [2].

>   * kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED =
> "1"

This is [3].

>   * kernel-fit-image: Add KERNEL_DTBVENDORED support for
> FIT_CONF_DEFAULT_DTB (this one is not merged on master yet)

This is still not even in master-next .

> same order as on master branch.

Thank you for your help !

[1] 
https://patchwork.yoctoproject.org/project/oe-core/patch/20260704214812.365483-1-marek.vasut@mailbox.org/
[2] 
https://patchwork.yoctoproject.org/project/oe-core/patch/20260630074356.10265-1-marek.vasut@mailbox.org/
[3] 
https://patchwork.yoctoproject.org/project/oe-core/patch/20260630074423.10306-1-marek.vasut@mailbox.org/

-- 
Best regards,
Marek Vasut