rm_work: Stop appending _setscene to do_image_complete_setscene stamps

This is a reworked version of the issue which 5479654eeaaa0f81bfff54ca49369c87f1658705
attempted to fix.

"""
Each time I build my image after the first, I end up with a
do_image_complete_setscene stamp file with an extra _setscene appended to
the name. Eventually, the filenames end up being so long that mv complains
and the build fails.

It looks like this behaviour was introduced when the special handling was
added for do_image_complete in 2ff9d40dc88d43567472218cf3d3faf414398c71.
"""

Instead of the original approach which broke do_package_setscene, add
an entry to explictly stop the stacking _setscene pieces on do_image_complete.

It's not straightforward to just move *do_image_complete* after the
*_setscene* pattern because do_image_complete stamps would then match
do_image*.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 31d99e4554a137bf51cf02f35f48cdfa1be829f8..07e63c31ad204087df637eb63ea2f54241166113 100644 (file)
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -61,6 +61,10 @@ do_rm_work () {
                 i=dummy
                 break
                 ;;
+            *do_image_complete_setscene*)
+                i=dummy
+                break
+                ;;
             *do_image_complete*)
                 mv $i `echo $i | sed -e "s#do_image_complete#do_image_complete_setscene#"`
                 i=dummy