From 8019f7fd9fac5d7d5c35fbcd1a40eb12d1f293f0 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 28 Jul 2022 12:14:20 +0000 Subject: [PATCH] vm_image_util.sh: update path to arm64 UEFI firmware The arm64 firmware is now called AAVMF with the updated edk2-aarch64 ebuild. --- build_library/vm_image_util.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index e7a966b75b..3f50810243 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -807,14 +807,10 @@ _write_qemu_uefi_conf() { # Get edk2 files into local build workspace. info "Updating edk2 in /build/${BOARD}" emerge-${BOARD} --nodeps --select --verbose --update --getbinpkg --newuse sys-firmware/edk2-aarch64 - # Create 64MiB flash device image files. - dd if=/dev/zero bs=1M count=64 of="$(_dst_dir)/${flash_rw}" \ - status=none - cp "/build/${BOARD}/usr/share/edk2-aarch64/QEMU_EFI.fd" \ - "$(_dst_dir)/${flash_ro}.work" - truncate --reference="$(_dst_dir)/${flash_rw}" \ - "$(_dst_dir)/${flash_ro}.work" - mv "$(_dst_dir)/${flash_ro}.work" "$(_dst_dir)/${flash_ro}" + cp "${BOARD_ROOT}/usr/share/AAVMF/AAVMF_CODE.fd" "$(_dst_dir)/${flash_ro}" + cp "${BOARD_ROOT}/usr/share/AAVMF/AAVMF_VARS.fd" "$(_dst_dir)/${flash_rw}" + truncate -s 64M "$(_dst_dir)/${flash_ro}" + truncate -s 64M "$(_dst_dir)/${flash_rw}" ;; esac