summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-12-19 16:14:23 -0200
committerArmin Kuster <akuster808@gmail.com>2018-02-23 07:28:51 -0800
commit57fd89cbd49318338d72ec1eaf55fe9cce7b09b8 (patch)
treefdf12f708ce0eb784149a6b6c9ae97ee18b96dcb
parent21655e5b4d6a525901328c75afb5c4e17857035f (diff)
downloadopenembedded-core-contrib-57fd89cbd49318338d72ec1eaf55fe9cce7b09b8.tar.gz
openembedded-core-contrib-57fd89cbd49318338d72ec1eaf55fe9cce7b09b8.tar.bz2
openembedded-core-contrib-57fd89cbd49318338d72ec1eaf55fe9cce7b09b8.zip
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> 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>
-rw-r--r--meta/classes/image_types_wic.bbclass3
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"
WKS_FILE_DEPENDS ??= ''
DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }"
+# We ensure all artfacts are deployed (e.g virtual/bootloader)
+do_image_wic[recrdeptask] += "do_deploy"
+
python do_write_wks_template () {
"""Write out expanded template contents to WKS_FULL_PATH."""
import re