diff options
author | Adrian Freihofer <adrian.freihofer@siemens.com> | 2024-09-03 22:48:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-09-04 12:38:44 +0100 |
commit | 6e0dc47ce41a31cd319c9b540b01a9d9c7138fa9 (patch) | |
tree | 14d9758075ab83556e9da97f42cd1d7dc55642d5 /scripts | |
parent | b161ca0008b954e571eed6fcb396eb5f7a581904 (diff) | |
download | poky-6e0dc47ce41a31cd319c9b540b01a9d9c7138fa9.tar.gz |
devtool: remove obsolete SRCTREECOVEREDTASKS handling
devtool modify generates a bbappend for kernel recipes which contains:
SRCTREECOVEREDTASKS="\
do_fetch \
do_kernel_checkout \
do_kernel_configcheck \
do_unpack \
do_validate_branches \
"
do_patch[noexec] = "1"
If the linux-yocto kernel is used, this is redundant. The
linux-yocto.bbclass already does the same:
linux-yocto sets SRCTREECOVEREDTASKS to
SRCTREECOVEREDTASKS="\
do_fetch \
do_kernel_checkout \
do_kernel_configcheck \
do_patch \
do_unpack \
do_validate_branches \
"
Also the do_patch[noexec] is redundant because the purpose of
SRCTREECOVEREDTASKS is to delete these tasks if the externalsrc.bbclass
is used.
The default value of SRCTREECOVEREDTASKS initialized in
externalsrc.bbclass is:
SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch"
This is fine for kernels which do not inherit the linux-yocto.bbclass.
The code in devtool modify is redundant and therefore removed.
(From OE-Core rev: 94ff1be36a1eeef7ddceb4fcf20425a03cd052de)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/devtool/standard.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 312eb8ab50..b2e1a6ca3a 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -952,9 +952,6 @@ def modify(args, config, basepath, workspace): | |||
952 | f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) | 952 | f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) |
953 | 953 | ||
954 | if bb.data.inherits_class('kernel', rd): | 954 | if bb.data.inherits_class('kernel', rd): |
955 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' | ||
956 | 'do_fetch do_unpack do_kernel_configcheck"\n') | ||
957 | f.write('\ndo_patch[noexec] = "1"\n') | ||
958 | f.write('\ndo_kernel_configme:prepend() {\n' | 955 | f.write('\ndo_kernel_configme:prepend() {\n' |
959 | ' if [ -e ${S}/.config ]; then\n' | 956 | ' if [ -e ${S}/.config ]; then\n' |
960 | ' mv ${S}/.config ${S}/.config.old\n' | 957 | ' mv ${S}/.config ${S}/.config.old\n' |