summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-12-19 16:14:23 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-21 10:21:00 +0000
commit88918c9efe7a0af90dcd704a847047708d54cd0b (patch)
tree8f4ea1e316ca1356bdb9275073759987673c0ed4
parent19b61c8cc62bd9c5b0205e94e397699c72203cd4 (diff)
downloadpoky-88918c9efe7a0af90dcd704a847047708d54cd0b.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: f387c28640cbb209b8a8ed5734b21c754d9f7663) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 222ae00433..dcf620cee0 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -41,6 +41,9 @@ WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}
41do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" 41do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}"
42do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}" 42do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}"
43 43
44# We ensure all artfacts are deployed (e.g virtual/bootloader)
45do_image_wic[recrdeptask] += "do_deploy"
46
44WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" 47WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native"
45WKS_FILE_DEPENDS_BOOTLOADERS = "" 48WKS_FILE_DEPENDS_BOOTLOADERS = ""
46WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" 49WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot"