From 2ff9d40dc88d43567472218cf3d3faf414398c71 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 30 Jul 2017 16:06:57 +0100 Subject: 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 --- meta/classes/rm_work.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/classes/rm_work.bbclass') diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 2a4e808b88..71c21a0f37 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 -- cgit 1.2.3-korg