@@ -28,8 +28,8 @@ local_conf_header:
WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks.in"
secure-boot: |
- # Add snakeoil and ovmf binaries for qemu
- IMAGER_BUILD_DEPS += "ebg-secure-boot-snakeoil ovmf-binaries"
+ # Add snakeoil binaries for qemu
+ IMAGER_BUILD_DEPS += "ebg-secure-boot-snakeoil"
IMAGER_INSTALL += "ebg-secure-boot-snakeoil"
ovmf: |
@@ -27,3 +27,6 @@ local_conf_header:
IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
+ ovmf-binaries: |
+ # Add ovmf binaries for qemu
+ IMAGER_BUILD_DEPS += "ovmf-binaries"
@@ -133,9 +133,11 @@ if [ -n "${SECURE_BOOT}" ]; then
${QEMU_COMMON_OPTIONS} "$@"
elif [ -n "${SWUPDATE_BOOT}" ]; then
+ ovmf_code=${OVMF_CODE:-./build/tmp/deploy/images/qemu-amd64/OVMF/OVMF_CODE_4M.fd}
+
${QEMU_PATH}${QEMU} \
-drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \
- -bios OVMF.fd \
+ -drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \
${QEMU_COMMON_OPTIONS} "$@"
else