diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-04-15 15:08:12 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2020-04-15 15:12:57 -0400 |
| commit | 885fb7d12a0cd224a6b06c15ea1eb64268402683 (patch) | |
| tree | af2fae8d27ca8688240bc8a9756a61d0bed071c1 /meta-agl-bsp | |
| parent | 15e5fa0593133a70dc18bb283cb43dfaea27ba3e (diff) | |
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
Diffstat (limited to 'meta-agl-bsp')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_qemux86-64.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index aaab86f5c..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 = "${@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 |