Skip to contentSkip to conversation

classes/archiver: run do_unpack_and_patch after do_preconfigure

PATCH New Joshua Watt 1 participant 1 message Jul 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 meta/classes/archiver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/archiver.bbclass +2 -2
index e221fff695..0744089f74 100644
@@ -582,8 +582,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
Signature · 1 line
2.27.0