From nobody Fri Dec 03 16:45:22 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 161A418B3D2C; Fri, 3 Dec 2021 16:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J5JbQ5qcQz4XfT; Fri, 3 Dec 2021 16:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7E1D144EA; Fri, 3 Dec 2021 16:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B3GjMs5030237; Fri, 3 Dec 2021 16:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3GjMPq030236; Fri, 3 Dec 2021 16:45:22 GMT (envelope-from git) Date: Fri, 3 Dec 2021 16:45:22 GMT Message-Id: <202112031645.1B3GjMPq030236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9a463b80e549 - stable/13 - CI: use amd64 EDK II firmware included with QEMU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a463b80e54947f2fea121ee044a811f1f46a1d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638549922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OeGLJxpZrCSJQOHgJksSPSDn+Lsqsc81uq6leOehRQ4=; b=rFaolTs2U8SYFht7nOhcnMRMnE3iWXd3gLfIgn8ckx1OrPFLXmLsmd1XcPiuxHt6bj5Dp7 ZYFCFdQ6GZV2pRDb93uWGRXCio55OyEyIw/czDzBUUnHM6AyaD/pkrtrN8P6VpdjKXbtrY D7T18yCgMLJg3L5dxrgkp+WgPctFIdnsVemJFZezC/S5lurfhBTXPOsX7m1pD/gMaXG5+c 00ZBPm3mVC2ulrcaNXkbXBJ9uvXfgCtZSllwwRIAj+MfAh8EuITzXr9CtPWutImFUicApv 4GKfHRizTOpc/dKskYrbxqnZmbCljDMSvTY2RpvMWskHWI4uAI+YBhpmeeeYxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638549922; a=rsa-sha256; cv=none; b=ZgJkosnNJwlxtNLS+p2p+xyg7LTGRjk6iLwyrVldQ0wnIy4sdd9exUgeov0e7E5XFJCUVU E6qqFabmKV0lv8Gdv0/StQOEgaNbyIhMq2orF6Q0/eX75vmmv66QBTN35+S6ROO2Anw77/ qFx0FJyD60J44SFMZnIapZiH19GFmWed6YqBfGmIAWeQl510r4p7PTDF+srFc08Chx4Xq5 d/ly7Rl2dT9c1Yx0AaE3mIFor5qdBNhR27BaQiX+7ZQ/AhFdj/bkyCMB+dfZYp8NCF2dMx IPMr6PxPP/XUNouysukOAeoUeAsfoFDfQQnQ5Y+swaoPJlcefwASzZFwMQLbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9a463b80e54947f2fea121ee044a811f1f46a1d5 commit 9a463b80e54947f2fea121ee044a811f1f46a1d5 Author: Ed Maste AuthorDate: 2021-06-26 00:10:34 +0000 Commit: Ed Maste 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