Date: Fri, 3 Dec 2021 16:45:22 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9a463b80e549 - stable/13 - CI: use amd64 EDK II firmware included with QEMU Message-ID: <202112031645.1B3GjMPq030236@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9a463b80e54947f2fea121ee044a811f1f46a1d5 commit 9a463b80e54947f2fea121ee044a811f1f46a1d5 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-06-26 00:10:34 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2021-12-03 16:44:48 +0000 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 (cherry picked from commit 7d9794b34bcd465a380f05b02ccfea469dd0a48e) --- .cirrus.yml | 2 +- tools/boot/ci-qemu-test.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8c9ee1f6745b..f58681973d7a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,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 llvm11 + - sh .cirrus-ci/pkg-install.sh qemu llvm11 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112031645.1B3GjMPq030236>