summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-08-12 02:31:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:14 +0100
commit9a94fce7f10ccf5b89b021712367085352c5e490 (patch)
tree7e4aa35b179810003a70a2bf6225bbba88c45936 /meta/classes
parentb0220d1b72b560b581554dd5b4065b2141580efc (diff)
downloadpoky-9a94fce7f10ccf5b89b021712367085352c5e490.tar.gz
rm_work: fix build break for do_image_complete
* since following commit: commit 2ff9d40dc88d43567472218cf3d3faf414398c71 Author: Richard Purdie <richard.purdie@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" (From OE-Core rev: 0c905d4e7fa8e5416945fa0d61ebc1d34409d1e6) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rm_work.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 3d7fb52e81..13a9e75d85 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -62,7 +62,7 @@ do_rm_work () {
62 break 62 break
63 ;; 63 ;;
64 *do_image_complete*) 64 *do_image_complete*)
65 mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` 65 mv $i `echo $i | sed -e "s#do_image_complete#do_image_complete_setscene#"`
66 i=dummy 66 i=dummy
67 break 67 break
68 ;; 68 ;;