From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 19 Jun 2018 10:07:43 +0000 (+0100)
Subject: Revert "rm_work: Stop appending _setscene to do_image_complete_setscene stamps"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2869b56efa53d144f4641b06e9780206c7100567;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Revert "rm_work: Stop appending _setscene to do_image_complete_setscene stamps"

Whilst this fixes the do_image_complete_setscene append problem, it creates a
new problem since the code can no longer reach the *do_package_setscene.*
code block below it. This breaks builds as per [YOCTO #12765]. Revert this
change in search of a better fix.

This reverts commit 5479654eeaaa0f81bfff54ca49369c87f1658705.

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

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 318d121d2b5..31d99e4554a 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -53,10 +53,6 @@ do_rm_work () {
             *do_setscene*)
                 break
                 ;;
-            *_setscene*)
-                i=dummy
-                break
-                ;;
             *sigdata*|*sigbasedata*)
                 i=dummy
                 break
@@ -93,6 +89,10 @@ do_rm_work () {
                 i=dummy
                 break
                 ;;
+            *_setscene*)
+                i=dummy
+                break
+                ;;
             *$j|*$j.*)
                 mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"`
                 i=dummy