diff mbox series

[isar-cip-core,2/6] start-qemu: Use Debian's OVMF also for SWUpdate mode

Message ID f65269cdbeb965667a7aad5b9eb5ba2eb43eddf1.1647238161.git.jan.kiszka@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series EFI Boot Guard 0.10, improvements for start-qemu, kernel update | expand

Commit Message

Jan Kiszka March 14, 2022, 6:09 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Align the SWUpate case with secure boot, resolving the need to provide
some OVMF.fd locally.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/ebg-secure-boot-snakeoil.yml | 4 ++--
 kas/opt/efibootguard.yml             | 3 +++
 start-qemu.sh                        | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index 1f4d668..d404df5 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -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: |
diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index f5f9169..9624584 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -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"
diff --git a/start-qemu.sh b/start-qemu.sh
index b623602..0431906 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -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