CI: use amd64 EDK II firmware included with QEMU
QEMU (now) includes a prebuilt EDK II firmare in edk2-x86_64-code.fd. Use that instead of requring a standalone uefi-edk2-qemu-x86_64 package. Reviewed by: imp MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D30915
This commit is contained in:
parent
9a8e4527f0
commit
7d9794b34b
@ -14,7 +14,7 @@ task:
|
|||||||
name: World and kernel amd64 build and boot smoke test
|
name: World and kernel amd64 build and boot smoke test
|
||||||
timeout_in: 120m
|
timeout_in: 120m
|
||||||
install_script:
|
install_script:
|
||||||
- sh .cirrus-ci/pkg-install.sh qemu uefi-edk2-qemu-x86_64 llvm12
|
- sh .cirrus-ci/pkg-install.sh qemu llvm12
|
||||||
setup_script:
|
setup_script:
|
||||||
- uname -a
|
- uname -a
|
||||||
- df -m
|
- df -m
|
||||||
|
@ -78,9 +78,8 @@ if [ -z "${OBJTOP}" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Locate the uefi firmware file used by qemu.
|
# Locate the uefi firmware file used by qemu.
|
||||||
: ${OVMF:=/usr/local/share/uefi-edk2-qemu/QEMU_UEFI_CODE-x86_64.fd}
|
: ${OVMF:=/usr/local/share/qemu/edk2-x86_64-code.fd}
|
||||||
if [ ! -r "${OVMF}" ]; then
|
if [ ! -r "${OVMF}" ]; then
|
||||||
echo "NOTE: UEFI firmware available in the uefi-edk2-qemu-x86_64 package" >&2
|
|
||||||
die "Cannot read UEFI firmware file ${OVMF}"
|
die "Cannot read UEFI firmware file ${OVMF}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user