uboot-config: fix KCONFIG_CONFIG_ROOTDIR path
PATCH 1/1 uboot-config: fix KCONFIG_CONFIG_ROOTDIR path
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
--- meta/classes-recipe/uboot-config.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/uboot-config.bbclass +2 -1
@@ -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")
---
base-commit: d3e757f21403554e7064c5fa2b353080d14d2ce7
change-id: 20260304-uboot_devtool_fix-170221fd17bc
Best regards,
Signature · 1 line
Francesco Valla <[email protected]>
Quoted 35 lines · Francesco Valla
Commit 22e96b3 ("u-boot: Make sure the build dir is unique for each
UBOOT_CONFIG") changed the u-boot build directory name to include theUBOOT_CONFIGvalue the build is performed for. Align to the new pattern also theKCONFIG_CONFIG_ROOTDIRvariable, 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_CONFIGcontains a single configuration:cp: cannot stat '<u-boot-builddir>/<u-boot-defconfig>/.config': No such file or directory
Signed-off-by Francesco Valla <[email protected]>--- meta/classes-recipe/uboot-config.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/classes-recipe/uboot-config.bbclass +2
-2@@ -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") ---base-commit:
d3e757f21403554e7064c5fa2b353080d14d2ce7
change-id: 20260304-uboot_devtool_fix-170221fd17bc
Quoted 1 line
Best regards,
I'm working on adding a test for this change to make sure we don't break it again in the future and I noticed two things.
1) This whole if block for the check is indented one for level too deep for what is required. I'll include moving this when I send in the test.
2) Do we really want to disable this if you have multiple configs. The logic of UBOOT_CONFIG is that the last entry in the list acts like the "default" set of uboot files. In other words, there is a symlink created with the proper UBOOT_BINARYNAME that points to the final version generated by the final config. So we could point KCONFIG_CONFIG_ROOTDIR to that final build directory and not disable this feature 100%.
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Hello Ryan,
Quoted 38 lines · Ryan Eatmon
Quoted 35 lines · Francesco Valla
Commit 22e96b3 ("u-boot: Make sure the build dir is unique for each
UBOOT_CONFIG") changed the u-boot build directory name to include theUBOOT_CONFIGvalue the build is performed for. Align to the new pattern also theKCONFIG_CONFIG_ROOTDIRvariable, 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_CONFIGcontains a single configuration:cp: cannot stat '<u-boot-builddir>/<u-boot-defconfig>/.config': No such file or directory
Signed-off-by Francesco Valla <[email protected]>--- meta/classes-recipe/uboot-config.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/classes-recipe/uboot-config.bbclass +2
-2@@ -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") ---base-commit:
d3e757f21403554e7064c5fa2b353080d14d2ce7
change-id: 20260304-uboot_devtool_fix-170221fd17bc
Quoted 9 lines
Quoted 1 line
Best regards,
I'm working on adding a test for this change to make sure we don't break it again in the future and I noticed two things.
1) This whole if block for the check is indented one for level too deep for what is required. I'll include moving this when I send in the test.
Right, I did not notice it.
Quoted 7 lines
2) Do we really want to disable this if you have multiple configs. The logic of
UBOOT_CONFIGis that the last entry in the list acts like the "default" set of uboot files. In other words, there is a symlink created with the properUBOOT_BINARYNAMEthat points to the final version generated by the final config. So we could pointKCONFIG_CONFIG_ROOTDIRto that final build directory and not disable this feature 100%.
This might help quick config change testing, but I'd at least leave a warning in that case, as it might mislead users, especially when approaching third-party layers with ton of configurations.
Quoted 5 lines
Signature · 4 lines
-- Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Regards,
Francesco