diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-30 16:06:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-31 14:25:44 +0100 |
| commit | 2ff9d40dc88d43567472218cf3d3faf414398c71 (patch) | |
| tree | 061ec25acf282a32b3be17fd31beec33c5b20c2a | |
| parent | f61bcae0926a1ad79032119cc5656c0e862b13af (diff) | |
| download | openembedded-core-2ff9d40dc88d43567472218cf3d3faf414398c71.tar.gz openembedded-core-2ff9d40dc88d43567472218cf3d3faf414398c71.tar.bz2 openembedded-core-2ff9d40dc88d43567472218cf3d3faf414398c71.zip | |
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@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/rm_work.bbclass | 5 |
2 files changed, 9 insertions, 0 deletions
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 # 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 |