mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-29 01:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1863 from flatcar/kai/arm64-nosb

Browse Source 
Skip non-UEFI qemu image symlink/script for arm64
This commit is contained in:
Kai Lüke 2024-04-10 13:14:05 +02:00 committed by GitHub
commit f389ea578e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build_library/vm_image_util.sh
View File

@ -594,9 +594,12 @@ write_vm_disk() {
local qemu_uefi_secure="${VM_DST_IMG/qemu_uefi/qemu_uefi_secure}" local qemu_uefi_secure="${VM_DST_IMG/qemu_uefi/qemu_uefi_secure}"
local target_basename local target_basename
target_basename=$(basename "${VM_DST_IMG}") 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}" ln -fs "${target_basename}" "${qemu_uefi_secure}"
VM_GENERATED_FILES+=( "${qemu}" "${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 # Add disk image to final file list if it isn't going to be bundled
@ -809,7 +812,9 @@ _write_qemu_uefi_conf() {
# We now only support building qemu_uefi and generate the # We now only support building qemu_uefi and generate the
# other artifacts from here # other artifacts from here
if [ "${VM_IMG_TYPE}" = qemu_uefi ]; then 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 VM_IMG_TYPE=qemu_uefi_secure _write_qemu_uefi_secure_conf
fi fi
} }