[oe-commits] [openembedded-core] 06/27: Revert "rm_work: Stop appending _setscene to do_image_complete_setscene stamps"

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 7bedc857ceb3f8c3126233291f5338588127418a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Jun 19 11:07:43 2018 +0100

    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.
---
 meta/classes/rm_work.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 318d121..31d99e4 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.