[oe-commits] [openembedded-core] 04/09: image/rm_work: Promote do_image_complete to be more sstate like

[Martin Jansa]

With this change I'm seeing all images failing with:

| DEBUG: Executing shell function do_rm_work
| mv:
?1.0-r0.4.0.do_image_complete.fb2421734f998a50c93250deb80d3024.MACHINE? and
?1.0-r0.4.0.do_image_complete.fb2421734f998a50c93250deb80d3024.MACHINE
? are the same file
| WARNING: exit code 1 from a shell command.

I'll check what's special on my config (what's matched in $j) that this
issue wasn't triggered on autobuilder, but any hints would be welcome as
well.

On Mon, Jul 31, 2017 at 4:14 PM, <git at git.openembedded.org> wrote:

> This is an automated email from the git hooks/post-receive script.
>
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
>
> commit 2ff9d40dc88d43567472218cf3d3faf414398c71
> Author: Richard Purdie <richard.purdie at linuxfoundation.org>
> AuthorDate: Sun Jul 30 16:06:57 2017 +0100
>
>     image/rm_work: Promote do_image_complete to be more sstate like
>
>     We relied on the missing do_image_complete_setscene task to ensure the
> dummy
>     sstate tarball that was created would never be used. This lead to its
> own
>     issues and a better fix for SSTATE_SKIP_CREATION has now been merged.
>
>     We can therefore make do_image_complete look like a more standard
> sstate
>     task which means image generation doesn't keep rerunning when using
> rm_work.
>
>     We do need to turn do_image_complete's stamp into an sstate version to
>     handle this (it otherwise matches the do_image_* glob).
>
>     Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
>  meta/classes/image.bbclass   | 4 ++++
>  meta/classes/rm_work.bbclass | 5 +++++
>  2 files changed, 9 insertions(+)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 0885fdb..696aacd 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -289,6 +289,10 @@ do_image_complete[sstate-inputdirs] =
> "${IMGDEPLOYDIR}"
>  do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
>  do_image_complete[stamp-extra-info] = "${MACHINE}"
>  addtask do_image_complete after do_image before do_build
> +python do_image_complete_setscene () {
> +    sstate_setscene(d)
> +}
> +addtask do_image_complete_setscene
>
>  # Add image-level QA/sanity checks to IMAGE_QA_COMMANDS
>  #
> diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
> index 2a4e808..71c21a0 100644
> --- a/meta/classes/rm_work.bbclass
> +++ b/meta/classes/rm_work.bbclass
> @@ -61,6 +61,11 @@ do_rm_work () {
>                  i=dummy
>                  break
>                  ;;
> +            *do_image_complete*)
> +                mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"`
> +                i=dummy
> +                break
> +                ;;
>              *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*
> do_vmimg*|*do_write_qemuboot_conf*)
>                  i=dummy
>                  break
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>