]> code.ossystems Code Review - openembedded-core.git/commit
image-live.bbclass: order do_bootimg after do_rootfs
authorGuillaume Champagne <champagne.guillaume.c@gmail.com>
Wed, 26 May 2021 18:32:50 +0000 (14:32 -0400)
committerSteve Sakoman <steve@sakoman.com>
Sat, 29 May 2021 00:22:21 +0000 (14:22 -1000)
commit4bc93b8ddc7bad210a5816eabd2e3e37b4afa6c1
tree4bb0b2b2c198e025f86c7287a7c45070c46999b9
parentb1e9fe67a85be516a0b32e0c91448df87a756e02
image-live.bbclass: order do_bootimg after do_rootfs

do_bootimg expects IMGDEPLOYDIR to exist, since it stores its artifacts
there. Therefore, do_bootimg should run after do_rootfs because
IMGDEPLOYDIR is created before do_rootfs runs since IMGDEPLOYDIR is
contained in do_rootfs' [cleandirs] varflag.

When do_bootimg depends on ${PN}:do_image_${LIVE_ROOTFS_TYPE},
do_bootimg is correctly ordered after do_rootfs because
do_image_${FSTYPE} tasks are added after do_image and do_image itself is
added after do_rootfs.

However, when do_bootimg doesn't depend on
${PN}:do_image_${LIVE_ROOTFS_TYPE}
(introduced by: 96f47c39f1d17f073243913d524bde84add41d8f), do_bootimg
can run before do_rootfs, thus before IMGDEPLOYDIR is created. To
avoid this situation, do_bootimg is now explicitly ordered after
do_rootfs.

Signed-off-by: Guillaume Champagne <champagne.guillaume.c@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 73c21db8e54002b300ba4972cb49c0577acc5406)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/image-live.bbclass