diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-12-19 16:14:23 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:11:58 +0000 |
commit | e30f8120acc13267afa68f5012cbe9767c7bc714 (patch) | |
tree | e6ddcc053bc6ea30dd9ce09f9c1ab31b76313bfb /meta | |
parent | ad19200c721cfdbd9c8fc10b7d193ddb52256ced (diff) | |
download | poky-e30f8120acc13267afa68f5012cbe9767c7bc714.tar.gz |
image_types_wic.bbclass: Ensure '-c image_wic' works
The 'wic' image may use files which has been deployed (e.g in
do_deploy) for some partitions that may need to be copied in a
specific partition or filesystem (e.g a bootloader).
When using 'bitbake <image> -c image_wic', from a clean build, the
contents of do_deploy must also be available so we need to ensure all
do_deploy of the image dependencies has been complete.
Reported-by: Fabio Berton <fabio.berton@ossystems.com.br>
(From OE-Core rev: 5e2a541f80e0f69ae00dfd96e50d2792750730cd)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f387c28640cbb209b8a8ed5734b21c754d9f7663)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 68f251cfd0..2fa4258283 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -43,6 +43,9 @@ do_image_wic[depends] += "wic-tools:do_populate_sysroot" | |||
43 | WKS_FILE_DEPENDS ??= '' | 43 | WKS_FILE_DEPENDS ??= '' |
44 | DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }" | 44 | DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }" |
45 | 45 | ||
46 | # We ensure all artfacts are deployed (e.g virtual/bootloader) | ||
47 | do_image_wic[recrdeptask] += "do_deploy" | ||
48 | |||
46 | python do_write_wks_template () { | 49 | python do_write_wks_template () { |
47 | """Write out expanded template contents to WKS_FULL_PATH.""" | 50 | """Write out expanded template contents to WKS_FULL_PATH.""" |
48 | import re | 51 | import re |