summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-04-08 16:14:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:07 +0100
commitb72dbb2e4bf2fb6cc39a87d9ca38ab4a515fe68f (patch)
tree1077489d57521a197ff28226c7d811b42db70020 /meta
parent4bd5cbabf6761df758cfa10ce312b0c134605424 (diff)
downloadpoky-b72dbb2e4bf2fb6cc39a87d9ca38ab4a515fe68f.tar.gz
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. (From OE-Core rev: 75d31beb03d9369448d8d77e12321aa2d91bebf0) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 6792c9a233..5bc627066e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -489,6 +489,12 @@ python () {
489 # If diffconfig is available, ensure it runs after kernel_configme 489 # If diffconfig is available, ensure it runs after kernel_configme
490 if 'do_diffconfig' in d: 490 if 'do_diffconfig' in d:
491 bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) 491 bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d)
492
493 externalsrc = d.getVar('EXTERNALSRC')
494 if externalsrc:
495 # If we deltask do_patch, do_kernel_configme is left without
496 # dependencies and runs too early
497 d.setVarFlag('do_kernel_configme', 'deps', (d.getVarFlag('do_kernel_configme', 'deps', False) or []) + ['do_unpack'])
492} 498}
493 499
494# extra tasks 500# extra tasks