Skip to contentSkip to conversation

kernel-yocto.bbclass: Fix deps when externalsrc is used

PATCH New Paul Barker 1 participant 1 message Apr 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-yocto.bbclass: Fix deps when externalsrc is used

do_kernel_configme was recently removed from SRCTREECOVEREDTASKS so this task still runs when externalsrc is used. This task normally runs after do_patch but when externalsrc is used, do_patch is removed and this ordering restriction does nothing. This allows bitbake to execute do_kernel_configme too early, causing races with do_unpack.

This is fixed by adding in a dependency on do_unpack when externalsrc is used.

---
 meta/classes/kernel-yocto.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)
meta/classes/kernel-yocto.bbclass +6 -0
index 6792c9a233..5bc627066e 100644
@@ -489,6 +489,12 @@ python () {
     # If diffconfig is available, ensure it runs after kernel_configme
     if 'do_diffconfig' in d:
         bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d)
+
+    externalsrc = d.getVar('EXTERNALSRC')
+    if externalsrc:
+        # If we deltask do_patch, do_kernel_configme is left without
+        # dependencies and runs too early
+        d.setVarFlag('do_kernel_configme', 'deps', (d.getVarFlag('do_kernel_configme', 'deps', False) or []) + ['do_unpack'])
 }
 
 # extra tasks
Signature · 1 line
2.20.1