[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7174/8267] rm_work: fix build break for do_image_complete
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7174/8267] rm_work: fix build break for do_image_complete
- Date: Sun, 17 Dec 2017 05:52:40 +0000 (UTC)
commit 9a94fce7f10ccf5b89b021712367085352c5e490
Author: Martin Jansa <martin jansa gmail com>
Date: 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 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>
meta/classes/rm_work.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
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
;;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]