On Mon, Jul 6, 2020 at 7:15 AM Joshua Watt <jpewhac...@gmail.com> wrote:
>
> Steve,
>
> Please also grab f02c190433 ("classes/archive: do_configure should not depend
> on do_ar_patched") as it fixes a bug introduced by this patch
Thanks, I'll also drop this patch from the pull request and add it
along with the fix in next week's batch of patches.
Steve
> On 7/6/20 11:10 AM, Steve Sakoman wrote:
>
> From: Joshua Watt <jpewhac...@gmail.com>
>
> 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 <jpewhac...@gmail.com>
> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
> (cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c)
> Signed-off-by: Steve Sakoman <st...@sakoman.com>
> ---
> meta/classes/archiver.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#140364):
https://lists.openembedded.org/g/openembedded-core/message/140364
Mute This Topic: https://lists.openembedded.org/mt/75336283/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
