summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-06-30 21:49:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-02 16:18:03 +0100
commit1c66128e7e63434fbade13796d671c5642ce2efe (patch)
tree21034dab85f4cccb8a13676dd82e10d42bebd0ac /meta
parentb175f6dd9a92cc4058b3603869aa807222b17237 (diff)
downloadpoky-1c66128e7e63434fbade13796d671c5642ce2efe.tar.gz
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 (From OE-Core rev: d4be264061023ae0ea6e023d82a7b99605bfc22c) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/archiver.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index e221fff695..0744089f74 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -582,8 +582,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
582addtask do_deploy_archives_setscene 582addtask do_deploy_archives_setscene
583 583
584addtask do_ar_original after do_unpack 584addtask do_ar_original after do_unpack
585addtask do_unpack_and_patch after do_patch 585addtask do_unpack_and_patch after do_patch do_preconfigure
586addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure 586addtask do_ar_patched after do_unpack_and_patch before do_configure
587addtask do_ar_configured after do_unpack_and_patch 587addtask do_ar_configured after do_unpack_and_patch
588addtask do_ar_mirror after do_fetch 588addtask do_ar_mirror after do_fetch
589addtask do_dumpdata 589addtask do_dumpdata