]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
uboot-config: Fix scope of KCONFIG_CONFIG_ROOTDIR check
authorRyan Eatmon <reatmon@ti.com>
Fri, 13 Mar 2026 15:14:21 +0000 (10:14 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 Mar 2026 16:46:41 +0000 (16:46 +0000)
The current check is in the inner loop of UBOOT_CONFIG, but the check is
attempting to only apply to the case when there is a single entry in
UBOOT_CONFIG.  Shift the indention to be outside of the for loop and
only execute once.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-recipe/uboot-config.bbclass

index f7848396c17fdf4835053b9f5a45480ef8ce9f1f..9e24db1f48e9c7678d3a6934cbe164088116a9e8 100644 (file)
@@ -247,15 +247,15 @@ python () {
             bb.debug(1, "Appending '%s' to UBOOT_CONFIG_FRAGMENTS." % fragments)
             d.appendVar('UBOOT_CONFIG_FRAGMENTS', fragments + " ? ")
 
-            # This recipe might be inherited e.g. by the kernel recipe via kernel-fitimage.bbclass
-            # Ensure the uboot specific menuconfig settings do not leak into other recipes
-            if 'u-boot' in recipename:
-                if len(ubootconfig) == 1:
-                    builddir = "%s-%s" % (d.getVar("UBOOT_MACHINE").strip(), config)
-                    d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join("${B}", builddir))
-                else:
-                    # Disable menuconfig for multiple configs
-                    d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false")
+        # This recipe might be inherited e.g. by the kernel recipe via kernel-fitimage.bbclass
+        # Ensure the uboot specific menuconfig settings do not leak into other recipes
+        if 'u-boot' in recipename:
+            if len(ubootconfig) == 1:
+                builddir = "%s-%s" % (d.getVar("UBOOT_MACHINE").strip(), config)
+                d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join("${B}", builddir))
+            else:
+                # Disable menuconfig for multiple configs
+                d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false")
 }
 
 uboot_config_get_indexed_value () {