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 15:13:31 +0100 |
commit | c6958bbd877fd48a7d92fd43b91b0e9c6755eed9 (patch) | |
tree | 3a6c2bc194f7a5c3f6b5933f7a98b3291175af30 /meta/classes/rm_work.bbclass | |
parent | 7b37b0ac071e84bb369266efd12976c1637a2917 (diff) | |
download | poky-c6958bbd877fd48a7d92fd43b91b0e9c6755eed9.tar.gz |
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).
(From OE-Core rev: 2ff9d40dc88d43567472218cf3d3faf414398c71)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rm_work.bbclass')
-rw-r--r-- | meta/classes/rm_work.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
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 () { | |||
61 | i=dummy | 61 | i=dummy |
62 | break | 62 | break |
63 | ;; | 63 | ;; |
64 | *do_image_complete*) | ||
65 | mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` | ||
66 | i=dummy | ||
67 | break | ||
68 | ;; | ||
64 | *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*do_vmimg*|*do_write_qemuboot_conf*) | 69 | *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*do_vmimg*|*do_write_qemuboot_conf*) |
65 | i=dummy | 70 | i=dummy |
66 | break | 71 | break |