diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2023-12-15 13:12:06 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-01-27 08:09:47 -1000 |
commit | 5d5c77bc4ce5d3c91750eb59a00c0237e6c12e0e (patch) | |
tree | 6ba9d94bb4aca5d0babf242dda6b18a0b75300fc | |
parent | edc3370b86fabc1d3eb19589a228146dff015471 (diff) | |
download | poky-5d5c77bc4ce5d3c91750eb59a00c0237e6c12e0e.tar.gz |
devtool: modify: Handle recipes with a menuconfig task correctly
This avoids the following error when running `devtool modify` on a
recipe that has a menuconfig task, but does not have
KCONFIG_CONFIG_ENABLE_MENUCONFIG set.
.../temp/run.do_configure.4163366: line 152:
${@ oe.types.boolean('${KCONFIG_CONFIG_ENABLE_MENUCONFIG}') }: bad substitution
WARNING: .../temp/run.do_configure.4163366:152 exit 1 from
'[ ${@ oe.types.boolean('${KCONFIG_CONFIG_ENABLE_MENUCONFIG}') } = True ]'
(From OE-Core rev: 91192e861f0f764799f0ae9943cf387b18c70820)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e87e6fa84a0c4b5ac8e736dc62f6e08390ba2436)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 55fa38ccfb..0126f75022 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -971,7 +971,7 @@ def modify(args, config, basepath, workspace): | |||
971 | '}\n') | 971 | '}\n') |
972 | if rd.getVarFlag('do_menuconfig','task'): | 972 | if rd.getVarFlag('do_menuconfig','task'): |
973 | f.write('\ndo_configure:append() {\n' | 973 | f.write('\ndo_configure:append() {\n' |
974 | ' if [ ${@ oe.types.boolean(\'${KCONFIG_CONFIG_ENABLE_MENUCONFIG}\') } = True ]; then\n' | 974 | ' if [ ${@oe.types.boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG"))} = True ]; then\n' |
975 | ' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n' | 975 | ' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n' |
976 | ' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n' | 976 | ' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n' |
977 | ' fi\n' | 977 | ' fi\n' |