summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-09-25 16:05:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-28 14:15:48 +0100
commitcbf566ec43b8a6cbe4db327cd90ce88be402f5e0 (patch)
tree47a7a6343336355316fac5bb10075a574c203b28 /meta/classes
parent0679d0b8592113c1c1b2804f4ce2de03bb7bb68b (diff)
downloadpoky-cbf566ec43b8a6cbe4db327cd90ce88be402f5e0.tar.gz
kernel.bbclass: ensure symlink_kernsrc task gets run even with externalsrc
Commit c5dfc2586b41 (kernel.bbclass: run do_symlink_kernsrc before do_patch) fixed a race between do_symlink_kernsrc and do_populate_lic. However, I missed the fact that when externalsrc.bbclass is in use, the do_patch task doesn't exist, meaning that do_symlink_kernsrc now doesn't get run at all, breaking the build. We need this task to run regardless of whether do_patch exists or not, so reinstate the configure->symlink_kernsrc dependency explicitly. Fixes: c5dfc2586b41 (kernel.bbclass: run do_symlink_kernsrc before do_patch) Reported-by: Chanho Park <parkch98@gmail.com> (From OE-Core rev: a2b50b74d609ce079ab36b82d4c7c3539fb56485) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 48135b3d41..78def5bbc1 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -172,7 +172,10 @@ 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_patch after do_unpack 175# do_patch is normally ordered before do_configure, but
176# externalsrc.bbclass deletes do_patch, breaking the dependency of
177# do_configure on do_symlink_kernsrc.
178addtask symlink_kernsrc before do_patch do_configure after do_unpack
176 179
177inherit kernel-arch deploy 180inherit kernel-arch deploy
178 181