summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-08-25 16:35:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-26 09:04:04 +0100
commit94ed64f3759b3814c95ab0a39e1088286f166458 (patch)
tree0759c3c9124eb628a80ed305cc475251b01e5540 /meta
parent810fa7928df8974c37f4b478936e275e439917ab (diff)
downloadpoky-94ed64f3759b3814c95ab0a39e1088286f166458.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: c5dfc2586b4135cc86e91bb04fed837daf505676) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e2ceb6a333..cba77daa7a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -172,7 +172,7 @@ python do_symlink_kernsrc () {
172 shutil.move(s, kernsrc) 172 shutil.move(s, kernsrc)
173 os.symlink(kernsrc, s) 173 os.symlink(kernsrc, s)
174} 174}
175addtask symlink_kernsrc before do_configure after do_unpack 175addtask symlink_kernsrc before do_patch after do_unpack
176 176
177inherit kernel-arch deploy 177inherit kernel-arch deploy
178 178