From: Joshua Watt Date: Wed, 1 Jul 2020 02:49:23 +0000 (-0500) Subject: classes/archiver: run do_unpack_and_patch after do_preconfigure X-Git-Tag: 2020-04.2-dunfell~35 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b6d4176f82b9728af91a4b982ca25fbbee5f9890;p=openembedded-core.git classes/archiver: run do_unpack_and_patch after do_preconfigure The commit 8a7c779487 ("classes/archiver: Create patched archive before configuring") fixed a race condition when using the archiver, but introduced a bug where the GCC source would occasionally be deleted due to the archiving code running before do_preconfigure. Instead, make sure the archiving code runs after do_preconfigure by making do_unpack_and_patch depend on it. This makes more sense anyway since do_preconfigure is effectively an extension of do_patch. This fixes errors like: cat: .../gcc/defaults.h: No such file or directory when making certain configuration changes Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index a8d3afcbe9..bf275f4543 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -583,8 +583,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}" addtask do_deploy_archives_setscene addtask do_ar_original after do_unpack -addtask do_unpack_and_patch after do_patch -addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure +addtask do_unpack_and_patch after do_patch do_preconfigure +addtask do_ar_patched after do_unpack_and_patch before do_configure addtask do_ar_configured after do_unpack_and_patch addtask do_ar_mirror after do_fetch addtask do_dumpdata