]> code.ossystems Code Review - openembedded-core.git/commitdiff
classes/archiver: Create patched archive before configuring
authorJoshua Watt <JPEWhacker@gmail.com>
Tue, 16 Jun 2020 14:39:17 +0000 (09:39 -0500)
committerSteve Sakoman <steve@sakoman.com>
Tue, 23 Jun 2020 14:33:47 +0000 (04:33 -1000)
do_configure and do_preconfigure can modify source files, which causes
race conditions if these tasks run in parallel with do_ar_patched. Add
explicit task dependencies to ensure that do_ar_patched finishes before
these tasks start. Specifically, this fixes a race condition with
gcc-source where do_ar_patched races with do_preconfigure deleting
gcc/gengtype-lex.c

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8a7c7794870815030239e90b03e37ed302b7e885)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/archiver.bbclass

index 780c562b689c804996fe5efeec9c06e9e0821975..a8d3afcbe9eff008cd188e1da401f43b935c8730 100644 (file)
@@ -584,7 +584,7 @@ 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
+addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure
 addtask do_ar_configured after do_unpack_and_patch
 addtask do_ar_mirror after do_fetch
 addtask do_dumpdata