X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_qemux86-64.inc;h=152dfff4faa9c44a9587eca988417f79a22cb2d6;hb=885fb7d12a0cd224a6b06c15ea1eb64268402683;hp=1fe839d68e55525a56b8e20a11641329303ac306;hpb=b749653a10ca1b360bda597f9feda3eabac7ca2a;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index 1fe839d68..152dfff4f 100644
--- 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 = "wic.vmdk"
+# 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
@@ -31,4 +34,4 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 QB_OPT_APPEND_append = " -vga virtio"
 
 # Use our own wks file
-WKS_FILE="directdisk.wks.in"
+WKS_FILE="systemd-intel-corei7-64-bootdisk.wks"