[PATCH] kernel-fitimage: Cope with FIT_CONF_DEFAULT_DTB being empty

[PATCH] kernel-fitimage: Cope with FIT_CONF_DEFAULT_DTB being empty

[mac]

From: Mike Crowe <mac@mcrowe.com>

Quote both sides of the comparison of ${FIT_CONF_DEFAULT_DTB} and $DTB
consistently to avoid parse errors if either side is empty.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Reviewed-by: Jack Mitchell <jack@embed.me.uk>
---
 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 07786647e1..c81c00f777 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -593,7 +593,7 @@ fitimage_assemble() {
 		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \
 		$(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do
 			# Set the default dtb image if it exists in the devicetree.
-			if [ ${FIT_CONF_DEFAULT_DTB} = $DTB ];then
+			if [ "${FIT_CONF_DEFAULT_DTB}" = "$DTB" ];then
 				default_dtb_image=$(echo "$DTB" | tr '/' '_')
 			fi
 
-- 
2.39.5

Re: [OE-core] [PATCH] kernel-fitimage: Cope with FIT_CONF_DEFAULT_DTB being empty

[Mathieu Dubois-Briand]

On Fri May 23, 2025 at 2:20 PM CEST, Mike Crowe via lists.openembedded.org wrote:
> From: Mike Crowe <mac@mcrowe.com>
>
> Quote both sides of the comparison of ${FIT_CONF_DEFAULT_DTB} and $DTB
> consistently to avoid parse errors if either side is empty.
>
> Signed-off-by: Mike Crowe <mac@mcrowe.com>
> Reviewed-by: Jack Mitchell <jack@embed.me.uk>
> ---

Hi Mike,

Thanks for your patch.

Just a note: this patch is conflicting with the "FIT image improvements"
series:
https://lists.openembedded.org/g/openembedded-core/message/217192

As this series is most likely going to be merged soon, can you rewrite
your patch on top of it?

Thanks!

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH] kernel-fitimage: Cope with FIT_CONF_DEFAULT_DTB being empty

[Mike Crowe]

On Sunday 25 May 2025 at 17:41:51 +0200, Mathieu Dubois-Briand wrote:
> On Fri May 23, 2025 at 2:20 PM CEST, Mike Crowe via lists.openembedded.org wrote:
> > From: Mike Crowe <mac@mcrowe.com>
> >
> > Quote both sides of the comparison of ${FIT_CONF_DEFAULT_DTB} and $DTB
> > consistently to avoid parse errors if either side is empty.
> >
> > Signed-off-by: Mike Crowe <mac@mcrowe.com>
> > Reviewed-by: Jack Mitchell <jack@embed.me.uk>
> > ---
> 
> Hi Mike,
> 
> Thanks for your patch.
> 
> Just a note: this patch is conflicting with the "FIT image improvements"
> series:
> https://lists.openembedded.org/g/openembedded-core/message/217192
> 
> As this series is most likely going to be merged soon, can you rewrite
> your patch on top of it?

Hi Mathieu,

I spotted that not long after I posted my patch. I replied, but somehow I
only managed to send that reply to Adrian Freihofer, the author of the
conflicting patch. Anyway, here's what I said:

> It looks like Adrian Freihofer's
> "[PATCH v5 14/17] kernel-fitimage: re-write its code in Python"
> in <20250523094152.727177-15-adrian.freihofer@siemens.com> removes this code
> and replaces it with Python which won't suffer from the problem. That's
> much better than my fix above.

So my patch can be ignored.

Thanks and sorry for the hassle.

Mike.

Re: [OE-core] [PATCH] kernel-fitimage: Cope with FIT_CONF_DEFAULT_DTB being empty

[Mathieu Dubois-Briand]

On Sun May 25, 2025 at 8:45 PM CEST, Mike Crowe wrote:
> On Sunday 25 May 2025 at 17:41:51 +0200, Mathieu Dubois-Briand wrote:
>> On Fri May 23, 2025 at 2:20 PM CEST, Mike Crowe via lists.openembedded.org wrote:
>> > From: Mike Crowe <mac@mcrowe.com>
>> >
>> > Quote both sides of the comparison of ${FIT_CONF_DEFAULT_DTB} and $DTB
>> > consistently to avoid parse errors if either side is empty.
>> >
>> > Signed-off-by: Mike Crowe <mac@mcrowe.com>
>> > Reviewed-by: Jack Mitchell <jack@embed.me.uk>
>> > ---
>> 
>> Hi Mike,
>> 
>> Thanks for your patch.
>> 
>> Just a note: this patch is conflicting with the "FIT image improvements"
>> series:
>> https://lists.openembedded.org/g/openembedded-core/message/217192
>> 
>> As this series is most likely going to be merged soon, can you rewrite
>> your patch on top of it?
>
> Hi Mathieu,
>
> I spotted that not long after I posted my patch. I replied, but somehow I
> only managed to send that reply to Adrian Freihofer, the author of the
> conflicting patch. Anyway, here's what I said:
>
>> It looks like Adrian Freihofer's
>> "[PATCH v5 14/17] kernel-fitimage: re-write its code in Python"
>> in <20250523094152.727177-15-adrian.freihofer@siemens.com> removes this code
>> and replaces it with Python which won't suffer from the problem. That's
>> much better than my fix above.
>
> So my patch can be ignored.
>
> Thanks and sorry for the hassle.
>
> Mike.

No problem, thanks for the update!

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com