From 1a961b4becf677c9eb07c5b24a8ddb75044663d1 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 12 Oct 2016 14:47:16 +0300 Subject: image_types.bbclass: add dependency do_image_wic -> do_bootimg To produce certain types of images wic uses do_bootimg results to assemble final image. For example, it copies BOOT/EFI directory produced by do_bootimg to boot partition for every EFI image. The tricky part of this is that do_bootimg task is not always run, so we can't always make do_image_wic depend on do_bootimg. We only need to do it if do_bootimg present in task graph. Thank to Cristopher Larson for this fix. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- meta/classes/image_types.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 5ef6f60b89..a7fffbce06 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -219,6 +219,11 @@ USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" +python () { + if d.getVar('USING_WIC', True) and 'do_bootimg' in d: + bb.build.addtask('do_image_wic', '', 'do_bootimg', d) +} + python do_write_wks_template () { """Write out expanded template contents to WKS_FULL_PATH.""" import re -- cgit 1.2.3-korg