diff options
author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2020-08-25 16:35:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:04:37 +0100 |
commit | 70f3451b2651d94b69d327bded663a8c01622821 (patch) | |
tree | e06bb19463b5d128e60921df360a373a8c19241e | |
parent | f18af9dc89c62d1e44a58f60d4b25c796faca79e (diff) | |
download | poky-70f3451b2651d94b69d327bded663a8c01622821.tar.gz |
kernel.bbclass: run do_symlink_kernsrc before do_patch
There's a race between do_symlink_kernsrc and do_populate_lic, since
the latter is ordered "after do_patch"; so the two may run in
parallel. In some cases, that actually causes do_populate_lic to fail
if it happens to look for a license file somewhere under ${S} in the
short window after shutil.move and before the symlink has been
created.
Fix that by simply ordering symlink_kernsrc before do_patch. Any task
that pokes around in ${S} looking for files should be ordered after
do_patch, so this should also fix similar latent races with other ad
hoc tasks.
(From OE-Core rev: 914d8a00e34a8edf75a349da6f5978e4ed60e6d5)
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c5dfc2586b4135cc86e91bb04fed837daf505676)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 9e3c34ad48..9eb9bd2844 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -152,7 +152,7 @@ python do_symlink_kernsrc () { | |||
152 | shutil.move(s, kernsrc) | 152 | shutil.move(s, kernsrc) |
153 | os.symlink(kernsrc, s) | 153 | os.symlink(kernsrc, s) |
154 | } | 154 | } |
155 | addtask symlink_kernsrc before do_configure after do_unpack | 155 | addtask symlink_kernsrc before do_patch after do_unpack |
156 | 156 | ||
157 | inherit kernel-arch deploy | 157 | inherit kernel-arch deploy |
158 | 158 | ||