[oe-commits] [openembedded-core] 19/40: rm_work: fix build break for do_image_complete

[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 109c48ed548a23b26f8907d98a39e134a24426c2
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Sat Aug 12 02:31:59 2017 +0200

    rm_work: fix build break for do_image_complete
    
    * since following commit:
      commit 2ff9d40dc88d43567472218cf3d3faf414398c71
      Author: Richard Purdie <richard.purdie at linuxfoundation.org>
      Date:   Sun Jul 30 16:06:57 2017 +0100
    
        image/rm_work: Promote do_image_complete to be more sstate like
    
      all image rm_work tasks are failing with:
      mv: 1.0-r0.do_image_complete.228730130ba309f85b73b72222ba11d7.raspberrypi3 and
          1.0-r0.do_image_complete.228730130ba309f85b73b72222ba11d7.raspberrypi3 are the same file
    
      it's because for $i 1.0-r0.do_image_complete.228730130ba309f85b73b72222ba11d7.raspberrypi3
      there will be first SSTATETASK in $j do_deploy, so the sed call doesn't replace anything
    
      It might be different order of SSTATETASKS in my builds (it might work only when
      do_image_complete is the first one in the list), but here:
      SSTATETASKS="do_deploy do_image_complete do_image_qa do_package do_package_qa do_package_write_ipk do_packagedata do_populate_lic do_populate_sdk do_populate_sdk_ext do_populate_sysroot"
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/rm_work.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 3d7fb52..13a9e75 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -62,7 +62,7 @@ do_rm_work () {
                 break
                 ;;
             *do_image_complete*)
-                mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"`
+                mv $i `echo $i | sed -e "s#do_image_complete#do_image_complete_setscene#"`
                 i=dummy
                 break
                 ;;

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