Skip to contentSkip to conversation

kernel.bbclass: ensure symlink_kernsrc task gets run even with externalsrc

PATCH New Rasmus Villemoes 1 participant 1 message Sep 25, 2020 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH v2 1/1 kernel.bbclass: ensure symlink_kernsrc task gets run even with externalsrc

In reply to a message not in the archive

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)

---
v2: update commit log to not say that externalsrc.bbclass is at fault for using deltask over [noexec]. Rest of the series is dropped.

 meta/classes/kernel.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/classes/kernel.bbclass +4 -1
index 48135b3d41..78def5bbc1 100644
@@ -172,7 +172,10 @@ python do_symlink_kernsrc () {
             shutil.move(s, kernsrc)
             os.symlink(kernsrc, s)
 }
-addtask symlink_kernsrc before do_patch after do_unpack
+# do_patch is normally ordered before do_configure, but
+# externalsrc.bbclass deletes do_patch, breaking the dependency of
+# do_configure on do_symlink_kernsrc.
+addtask symlink_kernsrc before do_patch do_configure after do_unpack
 
 inherit kernel-arch deploy
 
Signature · 1 line
2.23.0