diff mbox series

kernel-fit-image: exclude loadables property from DTBO config nodes

Message ID 20261119235902.705611-1-denis@denix.org
State New
Headers show
Series kernel-fit-image: exclude loadables property from DTBO config nodes | expand

Commit Message

Denys Dmytriyenko Nov. 19, 2026, 11:59 p.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

Similar to the previous fix[1], besides excluding the kernel propery
from DTBO config nodes, we also need to exclude loadables property
as well for the same reason detailed in[1].

It was handled properly back in OE 5.0 (and older) fitImage
implamentation, but got added incorrectly with OE 6.0 re-write.

[1] https://git.openembedded.org/openembedded-core/commit/?id=06ed34005957a6afb88270603df5e545941546b0

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta/lib/oe/fitimage.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/lib/oe/fitimage.py b/meta/lib/oe/fitimage.py
index 484e5c5ee0..c97b334413 100644
--- a/meta/lib/oe/fitimage.py
+++ b/meta/lib/oe/fitimage.py
@@ -431,10 +431,12 @@  class ItsNodeRootKernel(ItsNode):
         conf_desc = []
         sign_entries = []
         include_kernel = 1
+        include_loadables = 1
 
-        # DTBO configuration sections do not include kernel property
+        # DTBO configuration sections do not include kernel/loadables properties
         if dtb and os.path.splitext(dtb.name)[1] == ".dtbo":
             include_kernel = 0
+            include_loadables = 0
 
         if self._kernel and include_kernel:
             conf_desc.append("Linux kernel")
@@ -468,7 +470,7 @@  class ItsNodeRootKernel(ItsNode):
             if self._sign_enable:
                 sign_entries.append("setup")
 
-        if len(self._loadables) > 0:
+        if len(self._loadables) > 0 and include_loadables:
             conf_desc.append("loadables")
             opt_props["loadables"] = [ loadable.name for loadable in self._loadables ]
             if self._sign_enable: