From 9a14631d6617e104de5694744eaf7236b6988e52 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Wed, 8 Apr 2020 16:14:55 +0100 Subject: 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: 75b47388fb18aaf58db311e570c009350d64084f) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/kernel-yocto.bbclass') 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 () { # 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 -- cgit v1.2.3-54-g00ecf