diff options
| author |   Guillaume Champagne <champagne.guillaume.c@gmail.com> | 2021-05-26 14:32:50 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-05-28 14:22:21 -1000 |
| commit | 4bc93b8ddc7bad210a5816eabd2e3e37b4afa6c1 (patch) | |
| tree | 4bb0b2b2c198e025f86c7287a7c45070c46999b9 | |
| parent | b1e9fe67a85be516a0b32e0c91448df87a756e02 (diff) | |
| download | openembedded-core-contrib-4bc93b8ddc7bad210a5816eabd2e3e37b4afa6c1.tar.gz | |
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>
| -rw-r--r-- | meta/classes/image-live.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index e9eba1fc4b..2fa839b0de 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -261,4 +261,4 @@ python do_bootimg() { do_bootimg[subimages] = "hddimg iso" do_bootimg[imgsuffix] = "." -addtask bootimg before do_image_complete +addtask bootimg before do_image_complete after do_rootfs |