From 70f3451b2651d94b69d327bded663a8c01622821 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Tue, 25 Aug 2020 16:35:15 +0200 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit c5dfc2586b4135cc86e91bb04fed837daf505676) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 () { shutil.move(s, kernsrc) os.symlink(kernsrc, s) } -addtask symlink_kernsrc before do_configure after do_unpack +addtask symlink_kernsrc before do_patch after do_unpack inherit kernel-arch deploy -- cgit v1.2.3-54-g00ecf