meta-agl-bsp: restore wic disk images for qemux86-64

The cleanup done in commit de577de9 ("Consolidation of
AGL_DEFAULT_IMAGE_FSTYPES after review of machine use") inadvertently
removed the wic.{xz,bmap} additions that were done in commit cdbe6578
("Extend qemux86-64 images to support real hardware").  Add them to
AGL_EXTRA_IMAGE_FSTYPES for qemux86-64 so that they will be available
for use on physical hardware again.

Bug-AGL: SPEC-2931

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I7ea9cc195add6d015390c7b2b359234f0bfeaaea

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index aaab86f..152dfff 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -21,7 +21,10 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet"
 DISTRO_FEATURES_append = " sota"
 
 # Image support
-AGL_EXTRA_IMAGE_FSTYPES = "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}"
+# NOTE: wic.{xz,bmap} are here since qemu targets override
+#       AGL_DEFAULT_IMAGE_FSTYPES to not include them, but for Intel
+#       we actually do want them for use on physical hardware.
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}"
 IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
 
 # Root device