diff options
author | Adrian Freihofer <adrian.freihofer@siemens.com> | 2024-09-03 22:48:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-09-04 12:38:44 +0100 |
commit | b161ca0008b954e571eed6fcb396eb5f7a581904 (patch) | |
tree | 6cfe781c0d9b5b93723897ad13e3d2284940bade /scripts/lib/devtool/standard.py | |
parent | 19931344ade6044cd6e3a01af452315910d36ec2 (diff) | |
download | poky-b161ca0008b954e571eed6fcb396eb5f7a581904.tar.gz |
devtool: modify kernel adds append twice
Drop the redundant generation of the do_configure:append section for the
kernel. The same append is generated twice:
if bb.data.inherits_class('kernel', rd):
f.write('\ndo_configure:append() {\n'
' cp ${B}/.config ${S}/.config.baseline\n'
' ln -sfT ${B}/.config ${S}/.config.new\n'
'}\n')
KCONFIG_CONFIG_ENABLE_MENUCONFIG ??= "true"
KCONFIG_CONFIG_ROOTDIR ??= "${B}"
if rd.getVarFlag('do_menuconfig', 'task'):
f.write('\ndo_configure:append() {\n'
' if [ ${@oe.types.boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG"))} = True ]; then\n'
' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n'
' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n'
' fi\n'
'}\n')
In contradiction to the first code block the second code block considers
the variables which is correct.
(From OE-Core rev: b0733c440e861ed7bf70efdd9b7a73afb4701218)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.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.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 1d0fe13788..312eb8ab50 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -955,10 +955,6 @@ def modify(args, config, basepath, workspace): | |||
955 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' | 955 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' |
956 | 'do_fetch do_unpack do_kernel_configcheck"\n') | 956 | 'do_fetch do_unpack do_kernel_configcheck"\n') |
957 | f.write('\ndo_patch[noexec] = "1"\n') | 957 | f.write('\ndo_patch[noexec] = "1"\n') |
958 | f.write('\ndo_configure:append() {\n' | ||
959 | ' cp ${B}/.config ${S}/.config.baseline\n' | ||
960 | ' ln -sfT ${B}/.config ${S}/.config.new\n' | ||
961 | '}\n') | ||
962 | f.write('\ndo_kernel_configme:prepend() {\n' | 958 | f.write('\ndo_kernel_configme:prepend() {\n' |
963 | ' if [ -e ${S}/.config ]; then\n' | 959 | ' if [ -e ${S}/.config ]; then\n' |
964 | ' mv ${S}/.config ${S}/.config.old\n' | 960 | ' mv ${S}/.config ${S}/.config.old\n' |