summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda <ricardo.ribalda@gmail.com>2020-05-18 12:22:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commitaf11b386facccae152f4455dc4f9f6f329d4df06 (patch)
tree457dbaa79e9593c984bc30114657e279eb45df61
parent36688f92e75d0147532bc9939ec18012d86c2630 (diff)
downloadpoky-af11b386facccae152f4455dc4f9f6f329d4df06.tar.gz
classes/image_types_wic: Reorder do_flush_pseudodb
When IMAGE_FSTYPES contains more types than wic, it can happen than the pseudo database is not flushed properly. This can be solved by changing the order of when do_flush_pseudodb is launched. Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13898 Fixes: dde90a5dd2b2 ("wic: Fix multi images .wks with bitbake") (From OE-Core rev: 8f218fbcd1810d677b6b702cdb98a30e30598000) Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 445b0a9544b55735496bbb23dbff3399b3b9e9a4) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types_wic.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index f6c8d8995e..ae00acc5ea 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -151,7 +151,7 @@ python do_rootfs_wicenv () {
151 depdir = d.getVar('IMGDEPLOYDIR') 151 depdir = d.getVar('IMGDEPLOYDIR')
152 bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env') 152 bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env')
153} 153}
154addtask do_flush_pseudodb after do_image before do_image_wic 154addtask do_flush_pseudodb after do_rootfs before do_image do_image_qa
155addtask do_rootfs_wicenv after do_image before do_image_wic 155addtask do_rootfs_wicenv after do_image before do_image_wic
156do_rootfs_wicenv[vardeps] += "${WICVARS}" 156do_rootfs_wicenv[vardeps] += "${WICVARS}"
157do_rootfs_wicenv[prefuncs] = 'set_image_size' 157do_rootfs_wicenv[prefuncs] = 'set_image_size'