]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
rm_work: fix build break for do_image_complete
authorMartin Jansa <martin.jansa@gmail.com>
Sat, 12 Aug 2017 00:31:59 +0000 (02:31 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 15 Aug 2017 23:01:41 +0000 (00:01 +0100)
commit0c905d4e7fa8e5416945fa0d61ebc1d34409d1e6
treee0409863ea3c5ed0da74caafabf0ed7a6f1022d4
parent3b4182968c5a1271748002f0e0264f54643a9f1c
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"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/rm_work.bbclass