Skip to content

Commit

Permalink
Merge pull request #1863 from flatcar/kai/arm64-nosb
Browse files Browse the repository at this point in the history
Skip non-UEFI qemu image symlink/script for arm64
  • Loading branch information
pothos authored Apr 10, 2024
2 parents a9cd30c + 286a8ca commit f389ea5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions build_library/vm_image_util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,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}"
if [ "${BOARD}" = amd64-usr ]; then
ln -fs "${target_basename}" "${qemu}"
VM_GENERATED_FILES+=( "${qemu}" )
fi
ln -fs "${target_basename}" "${qemu_uefi_secure}"
VM_GENERATED_FILES+=( "${qemu}" "${qemu_uefi_secure}" )
VM_GENERATED_FILES+=( "${qemu_uefi_secure}" )
fi

# Add disk image to final file list if it isn't going to be bundled
Expand Down Expand Up @@ -809,7 +812,9 @@ _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
if [ "${BOARD}" = amd64-usr ]; then
VM_IMG_TYPE=qemu _write_qemu_conf
fi
VM_IMG_TYPE=qemu_uefi_secure _write_qemu_uefi_secure_conf
fi
}
Expand Down

0 comments on commit f389ea5

Please sign in to comment.