diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-06-26 00:10:34 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-06-26 18:22:48 +0000 |
| commit | 7d9794b34bcd465a380f05b02ccfea469dd0a48e (patch) | |
| tree | 0a9a3a2c99b765fe1f20dc743b98c09496a56d42 | |
| parent | 9a8e4527f07dbb356bb1942efc09888f957df056 (diff) | |
| download | src-7d9794b34bcd465a380f05b02ccfea469dd0a48e.tar.gz src-7d9794b34bcd465a380f05b02ccfea469dd0a48e.zip | |
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
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | tools/boot/ci-qemu-test.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index db0e4e4c0543..575f882b8b48 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ task: name: World and kernel amd64 build and boot smoke test timeout_in: 120m 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: - uname -a - df -m diff --git a/tools/boot/ci-qemu-test.sh b/tools/boot/ci-qemu-test.sh index c68531550dbc..acd905b7ece8 100755 --- a/tools/boot/ci-qemu-test.sh +++ b/tools/boot/ci-qemu-test.sh @@ -78,9 +78,8 @@ if [ -z "${OBJTOP}" ]; then fi # 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 - echo "NOTE: UEFI firmware available in the uefi-edk2-qemu-x86_64 package" >&2 die "Cannot read UEFI firmware file ${OVMF}" fi |