diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2023-12-15 13:12:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-16 13:05:42 +0000 |
commit | 53d45455a22490bb5d29f62d43b4afa865e141d2 (patch) | |
tree | c6c0658511cd8c765e1c5ba096425f156176f60d /scripts | |
parent | 83cad97561cb950577d36542c874b91ba0c94417 (diff) | |
download | poky-53d45455a22490bb5d29f62d43b4afa865e141d2.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: e87e6fa84a0c4b5ac8e736dc62f6e08390ba2436)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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 c5b6458d06..559fd45676 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -986,7 +986,7 @@ def modify(args, config, basepath, workspace): | |||
986 | '}\n') | 986 | '}\n') |
987 | if rd.getVarFlag('do_menuconfig','task'): | 987 | if rd.getVarFlag('do_menuconfig','task'): |
988 | f.write('\ndo_configure:append() {\n' | 988 | f.write('\ndo_configure:append() {\n' |
989 | ' if [ ${@ oe.types.boolean(\'${KCONFIG_CONFIG_ENABLE_MENUCONFIG}\') } = True ]; then\n' | 989 | ' if [ ${@oe.types.boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG"))} = True ]; then\n' |
990 | ' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n' | 990 | ' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n' |
991 | ' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n' | 991 | ' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n' |
992 | ' fi\n' | 992 | ' fi\n' |