<div dir="ltr"><div>With this change I'm seeing all images failing with:</div><div><br></div><div>| DEBUG: Executing shell function do_rm_work</div><div>| mv: ?1.0-r0.4.0.do_image_complete.fb2421734f998a50c93250deb80d3024.MACHINE? and ?1.0-r0.4.0.do_image_complete.fb2421734f998a50c93250deb80d3024.MACHINE</div><div>? are the same file </div><div>| WARNING: exit code 1 from a shell command.</div><div><br></div><div>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.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 31, 2017 at 4:14 PM, <span dir="ltr"><<a href="mailto:git@git.openembedded.org" target="_blank">git@git.openembedded.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is an automated email from the git hooks/post-receive script.<br>
<br>
rpurdie pushed a commit to branch master<br>
in repository openembedded-core.<br>
<br>
commit 2ff9d40dc88d43567472218cf3d3fa<wbr>f414398c71<br>
Author: Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@<wbr>linuxfoundation.org</a>><br>
AuthorDate: Sun Jul 30 16:06:57 2017 +0100<br>
<br>
image/rm_work: Promote do_image_complete to be more sstate like<br>
<br>
We relied on the missing do_image_complete_setscene task to ensure the dummy<br>
sstate tarball that was created would never be used. This lead to its own<br>
issues and a better fix for SSTATE_SKIP_CREATION has now been merged.<br>
<br>
We can therefore make do_image_complete look like a more standard sstate<br>
task which means image generation doesn't keep rerunning when using rm_work.<br>
<br>
We do need to turn do_image_complete's stamp into an sstate version to<br>
handle this (it otherwise matches the do_image_* glob).<br>
<br>
Signed-off-by: Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@<wbr>linuxfoundation.org</a>><br>
---<br>
meta/classes/image.bbclass | 4 ++++<br>
meta/classes/rm_work.bbclass | 5 +++++<br>
2 files changed, 9 insertions(+)<br>
<br>
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass<br>
index 0885fdb..696aacd 100644<br>
--- a/meta/classes/image.bbclass<br>
+++ b/meta/classes/image.bbclass<br>
@@ -289,6 +289,10 @@ do_image_complete[sstate-<wbr>inputdirs] = "${IMGDEPLOYDIR}"<br>
do_image_complete[sstate-<wbr>outputdirs] = "${DEPLOY_DIR_IMAGE}"<br>
do_image_complete[stamp-extra-<wbr>info] = "${MACHINE}"<br>
addtask do_image_complete after do_image before do_build<br>
+python do_image_complete_setscene () {<br>
+ sstate_setscene(d)<br>
+}<br>
+addtask do_image_complete_setscene<br>
<br>
# Add image-level QA/sanity checks to IMAGE_QA_COMMANDS<br>
#<br>
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass<br>
index 2a4e808..71c21a0 100644<br>
--- a/meta/classes/rm_work.bbclass<br>
+++ b/meta/classes/rm_work.bbclass<br>
@@ -61,6 +61,11 @@ do_rm_work () {<br>
i=dummy<br>
break<br>
;;<br>
+ *do_image_complete*)<br>
+ mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"`<br>
+ i=dummy<br>
+ break<br>
+ ;;<br>
*do_rootfs*|*do_image*|*do_<wbr>bootimg*|*do_bootdirectdisk*|*<wbr>do_vmimg*|*do_write_qemuboot_<wbr>conf*)<br>
i=dummy<br>
break<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
To stop receiving notification emails like this one, please contact<br>
the administrator of this repository.<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-commits mailing list<br>
<a href="mailto:Openembedded-commits@lists.openembedded.org">Openembedded-commits@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-commits" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>commits</a><br>
</font></span></blockquote></div><br></div>