From e152f01daf1ceca1cad1f762435589a0b6a210f9 Mon Sep 17 00:00:00 2001 From: Ulrich Ölmann Date: Wed, 16 Oct 2024 08:47:56 +0200 Subject: fitimage: fix name of default configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new fitimage.bbclass was introduced via GitHub pullrequest [1]. There was a small force-push which implemented a prefix for the names of the configuration nodes to harmonize the class with the mechanism found in OE-core (see [2] & [3]). Unfortunately it was forgotten to also apply that prefix to the name of the configuration to utilize by default - fix that. [1] https://github.com/openembedded/meta-openembedded/pull/882 [2] https://github.com/openembedded/meta-openembedded/pull/882#issuecomment-2402218973 [3] https://github.com/openembedded/meta-openembedded/compare/0773f63e829b399a3e87cee03b009846c48b8429..32e7947154ea10e17f5db95d6bfaaf5074663fc7 Signed-off-by: Ulrich Ölmann Signed-off-by: Khem Raj --- meta-oe/classes/fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass index 78e30eca33..ebd034883b 100644 --- a/meta-oe/classes/fitimage.bbclass +++ b/meta-oe/classes/fitimage.bbclass @@ -302,7 +302,7 @@ def fitimage_emit_section_config(d, fd, dtb, kernelcount, ramdiskcount, setupcou if bootscriptid: conf_desc += ", u-boot script" if dtbcount == 1: - conf_default = d.getVar('FITIMAGE_DEFAULT_CONFIG', True) or dtb + conf_default = d.getVar('FITIMAGE_DEFAULT_CONFIG', True) or f'{conf_prefix}{dtb}' if conf_default: fd.write(f'\t\tdefault = "{conf_default}";\n') -- cgit v1.2.3-54-g00ecf