From: Ryan Eatmon <reatmon@ti.com>
Date: Fri, 13 Mar 2026 15:14:21 +0000 (-0500)
Subject: uboot-config: Fix scope of KCONFIG_CONFIG_ROOTDIR check
X-Git-Tag: yocto-6.0_M3~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16054e30b2ea5852b1658da94d51cc6336163a7a;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

uboot-config: Fix scope of KCONFIG_CONFIG_ROOTDIR check

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>
---

diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass
index f7848396c1..9e24db1f48 100644
--- a/meta/classes-recipe/uboot-config.bbclass
+++ b/meta/classes-recipe/uboot-config.bbclass
@@ -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 () {