summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorGuillaume Champagne <champagne.guillaume.c@gmail.com>2021-05-26 14:32:50 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-03 16:30:56 +0100
commitb9e8b3cc49ea12718b03c43c6c328dc0d4543f64 (patch)
treefc5d270862f5be008cf787e9210458396a1bc653 /meta
parent2691f9aa0d9e4ee8faec5b5fc35a136fbecc8fac (diff)
downloadpoky-b9e8b3cc49ea12718b03c43c6c328dc0d4543f64.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. (From OE-Core rev: 4bc93b8ddc7bad210a5816eabd2e3e37b4afa6c1) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-live.bbclass2
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() {
261do_bootimg[subimages] = "hddimg iso" 261do_bootimg[subimages] = "hddimg iso"
262do_bootimg[imgsuffix] = "." 262do_bootimg[imgsuffix] = "."
263 263
264addtask bootimg before do_image_complete 264addtask bootimg before do_image_complete after do_rootfs