From f9b1bf71ce4b5dc6d305dd4fe45d091a3b71494a Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 10 Apr 2024 12:46:08 +0900 Subject: [PATCH] Skip non-UEFI and UEFI-Secure-Boot qemu image symlink/script for arm64 We didn't generate this before and it does not work in old branches. --- build_library/vm_image_util.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index eb90e02ef3..de79d5fc67 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -532,9 +532,12 @@ write_vm_disk() { local qemu_uefi_secure="${VM_DST_IMG/qemu_uefi/qemu_uefi_secure}" local target_basename target_basename=$(basename "${VM_DST_IMG}") - ln -fs "${target_basename}" "${qemu}" - ln -fs "${target_basename}" "${qemu_uefi_secure}" - VM_GENERATED_FILES+=( "${qemu}" "${qemu_uefi_secure}" ) + if [ "${BOARD}" = amd64-usr ]; then + ln -fs "${target_basename}" "${qemu}" + VM_GENERATED_FILES+=( "${qemu}" ) + ln -fs "${target_basename}" "${qemu_uefi_secure}" + VM_GENERATED_FILES+=( "${qemu_uefi_secure}" ) + fi fi # Add disk image to final file list if it isn't going to be bundled @@ -746,8 +749,10 @@ _write_qemu_uefi_conf() { # We now only support building qemu_uefi and generate the # other artifacts from here if [ "${VM_IMG_TYPE}" = qemu_uefi ]; then - VM_IMG_TYPE=qemu _write_qemu_conf - VM_IMG_TYPE=qemu_uefi_secure _write_qemu_uefi_secure_conf + if [ "${BOARD}" = amd64-usr ]; then + VM_IMG_TYPE=qemu _write_qemu_conf + VM_IMG_TYPE=qemu_uefi_secure _write_qemu_uefi_secure_conf + fi fi }