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/image.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0885fdb505..696aacdb9a 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 # -- cgit 1.2.3-korg