diff options
| author | Ricardo Ribalda <ricardo.ribalda@gmail.com> | 2020-05-18 12:22:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-19 22:57:27 +0100 |
| commit | 81e481b0177d3280f46c204e107f20dfd3ebc0f6 (patch) | |
| tree | 2b926b70fa703986cc34ae3f821237a0def34e41 /meta/classes/image_types_wic.bbclass | |
| parent | 9350a816a7ad352391ef2737947ad569b877dd4d (diff) | |
| download | poky-81e481b0177d3280f46c204e107f20dfd3ebc0f6.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: 445b0a9544b55735496bbb23dbff3399b3b9e9a4)
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types_wic.bbclass')
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 96ed0473ee..7b1db50a28 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
| @@ -142,7 +142,7 @@ python do_rootfs_wicenv () { | |||
| 142 | depdir = d.getVar('IMGDEPLOYDIR') | 142 | depdir = d.getVar('IMGDEPLOYDIR') |
| 143 | bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env') | 143 | bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env') |
| 144 | } | 144 | } |
| 145 | addtask do_flush_pseudodb after do_image before do_image_wic | 145 | addtask do_flush_pseudodb after do_rootfs before do_image do_image_qa |
| 146 | addtask do_rootfs_wicenv after do_image before do_image_wic | 146 | addtask do_rootfs_wicenv after do_image before do_image_wic |
| 147 | do_rootfs_wicenv[vardeps] += "${WICVARS}" | 147 | do_rootfs_wicenv[vardeps] += "${WICVARS}" |
| 148 | do_rootfs_wicenv[prefuncs] = 'set_image_size' | 148 | do_rootfs_wicenv[prefuncs] = 'set_image_size' |