summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/standard.py
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2023-05-13 18:05:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-09 13:55:21 +0100
commit0241bdb49c52c28cc54ffed5bd4cde387f57451e (patch)
tree3477c7992dc49da5a8e4afcc41a883f63514165b /scripts/lib/devtool/standard.py
parent7e2199be524e4dd7783c54157d8b4bf9f57664b3 (diff)
downloadpoky-0241bdb49c52c28cc54ffed5bd4cde387f57451e.tar.gz
meta: introduce KCONFIG_CONFIG_ENABLE_MENUCONFIG
Currently, uboot do_menuconfig task is breaking when UBOOT_CONFIG is chosen rather than UBOOT_MACHINE, it simply fails with the following errors: | make: *** No rule to make target 'menuconfig'. Stio. | Command failed. | Press any key to continue... this is due to the work directory of do_menuconfig is set to ${B} but not ${B}/$config. We should distinguish two situations: 1) When there is only one config item in UBOOT_CONFIG, do_menuconfig should work just like how it works for UBOOT_MACHINE. 2) When there are multiple config items in UBOOT_CONFIG, do_menuconfig should print out some information saying it's not supported other than just failing. This patch mainly aims to fix that by introducing a extra variable KCONFIG_CONFIG_ENABLE_MENUCONFIG, it would be set to 'false' for situation 2), and when it's set to 'true', then set KCONFIG_CONFIG_ROOTDIR correctly in uboot-config.bbclass to let do_menuconfig task work. DEVTOOL_DISABLE_MENUCONFIG could be replaced by this new variable KCONFIG_CONFIG_ENABLE_MENUCONFIG. (From OE-Core rev: f9e834e317880cf47dbb4f8285bc36d743beae5e) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r--scripts/lib/devtool/standard.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 0339d12763..852672810a 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -968,9 +968,9 @@ def modify(args, config, basepath, workspace):
968 '}\n') 968 '}\n')
969 if rd.getVarFlag('do_menuconfig','task'): 969 if rd.getVarFlag('do_menuconfig','task'):
970 f.write('\ndo_configure:append() {\n' 970 f.write('\ndo_configure:append() {\n'
971 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' 971 ' if [ ${@ oe.types.boolean(\'${KCONFIG_CONFIG_ENABLE_MENUCONFIG}\') } = True ]; then\n'
972 ' cp ${B}/.config ${S}/.config.baseline\n' 972 ' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n'
973 ' ln -sfT ${B}/.config ${S}/.config.new\n' 973 ' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n'
974 ' fi\n' 974 ' fi\n'
975 '}\n') 975 '}\n')
976 if initial_rev: 976 if initial_rev: