@@ -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 () {
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> --- meta/classes-recipe/uboot-config.bbclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)