| Message ID | 20260305-uboot_devtool_fix-v1-1-4eeba4bbe4c4@valla.it |
|---|---|
| State | Under Review |
| Headers | show |
| Series | uboot-config: fix KCONFIG_CONFIG_ROOTDIR path | expand |
diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index 112fea2de44cd716fbe65598b275410a4fb90056..f7848396c17fdf4835053b9f5a45480ef8ce9f1f 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass @@ -251,7 +251,8 @@ python () { # Ensure the uboot specific menuconfig settings do not leak into other recipes if 'u-boot' in recipename: if len(ubootconfig) == 1: - d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join("${B}", d.getVar("UBOOT_MACHINE").strip())) + 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")
Commit 22e96b3 ("u-boot: Make sure the build dir is unique for each UBOOT_CONFIG") changed the u-boot build directory name to include the UBOOT_CONFIG value the build is performed for. Align to the new pattern also the KCONFIG_CONFIG_ROOTDIR variable, which is used by devtool to create a config baseline in case the menuconfig task is enabled. This fixes the following error, which can be seen when building u-boot under devtool and UBOOT_CONFIG contains a single configuration: cp: cannot stat '<u-boot-builddir>/<u-boot-defconfig>/.config': No such file or directory Signed-off-by: Francesco Valla <francesco@valla.it> --- meta/classes-recipe/uboot-config.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- base-commit: d3e757f21403554e7064c5fa2b353080d14d2ce7 change-id: 20260304-uboot_devtool_fix-170221fd17bc Best regards,