From nobody Sun Oct 19 23:51:04 2025 X-Original-To: dev-commits-src-branches@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 4cqb144rPpz6Cmgr; Sun, 19 Oct 2025 23:51:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqb143VNdz3lMM; Sun, 19 Oct 2025 23:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760917864; 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=XGbsXWB705leVHAWfgNQixpVuLDhQhQWiccrubhAxvs=; b=VpAYi2/MuJoupMuuWt6bCY2B+erC35+JC7sgToSNRuR3wJ66I8uTFAXfWcs5kDy+9Ber9m cJ7RRGSTgKFqLJTaAHnEBTay60ojIjL51JA1TMxCJc0OkPFOW58sihmvTikg5t5kT/1upF oGLIo8V5+PJp9FXubs7lS7V9gNCyN1mYINJ6kiIK/cxp0BblNaaTDWbGCND+RwkdNhrQJz LeQToc0mN1J/73RO9IX2IcRqZNOQNU7k5izJ0E6sg4pMQCPrUVyek7QnKqO54cz3oJ5qYK NJ93vi4p+Obc3tXY6ac4eTfHFi+NPBiTNpdrqp5ep3f/C49jJ9CroxQtHqOVkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760917864; 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=XGbsXWB705leVHAWfgNQixpVuLDhQhQWiccrubhAxvs=; b=g2pf5HKWcbANZUVSv6rJe7UJYWRcaEcMRGr2YQG3FMRZRut80v5xiPAadTPva6SJJh1eIb yBZ+YQoobXgPmDawhMg30JbgDl2jeY5Z1YS04pN975HrPRT92tI4iIKs2oe4j1GCVcesG0 HTsoKeyu8YkNNkO36y4SLxsJuif/ZQdKo16moBPdCfG8AM5mPa/EM6A8W92y9aVkIozpL0 Yw09dcZs7Cn1MuT6uf9ZKkeNNL3FLXJ8iKeJPQg9ZdMXMYlgsabIMJtj5Sr/N9iwSg4joh wpg7MfZf9+MCi2JSAL1lJNRoLCp3erxN1rgbQMvG0RQuqBm+pfoP/H0KP8wTNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760917864; a=rsa-sha256; cv=none; b=LBHOuwoaH3mLxSBt64jaAMloU2Dck3qqATWhrwFSRyNvIHgQ74NZnCxVvsDUuIfawTqW4K VNl3QBfzFo0D1beiPEQdYk5d4CZY0NzbQEMkcWWSXdu7z+VfRrtjerW1MSbatIzk4LMldO LUqkE7VYwvUN0ibOYrADVKguTKtPQmelBGBre167LfEW6/eZ23DrgH5idS4qlIDuSyJ9Hf B6D8DMhzAXFlILfXFGNd4550dlyQU5tWQ0UaexS1RzGuW9dvfWNJXL+Q4t2k/vZj2P2zUe +RFUt8+YWg/LaJLPQ8TyFh037HpPQWn3YYEjUL18VN8WwsbLZBPYwo0u/+04hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cqb142BRgzpXN; Sun, 19 Oct 2025 23:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59JNp4Nx084530; Sun, 19 Oct 2025 23:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59JNp4cv084527; Sun, 19 Oct 2025 23:51:04 GMT (envelope-from git) Date: Sun, 19 Oct 2025 23:51:04 GMT Message-Id: <202510192351.59JNp4cv084527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7cd9d3fe838c - releng/15.0 - vmrun.sh: Don't require firmware on amd64 unless -E was specified List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7cd9d3fe838c0ff77e4de9c1570856f261d96f18 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7cd9d3fe838c0ff77e4de9c1570856f261d96f18 commit 7cd9d3fe838c0ff77e4de9c1570856f261d96f18 Author: Mark Johnston AuthorDate: 2025-10-16 14:48:39 +0000 Commit: Colin Percival CommitDate: 2025-10-19 23:50:44 +0000 vmrun.sh: Don't require firmware on amd64 unless -E was specified Approved by: re (cperciva) PR: 290232 Reported by: David Marker Fixes: aa34b1d20e44 ("vmrun.sh: Add arm64 support") MFC after: 3 days (cherry picked from commit f19f17b3af675fbbc1244b66bbd8fb4a9836cb02) (cherry picked from commit 6c5540eebcf25e3f81c3ec9bfa762390d2a86885) --- share/examples/bhyve/vmrun.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index 52935363023a..e0052e781dc0 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -268,8 +268,10 @@ fi if [ -z "$firmware" ]; then case ${platform} in amd64) - firmware="${efi_firmware}" - firmware_pkg="edk2-bhyve" + if [ ${efi_mode} -ne 0 ]; then + firmware="${efi_firmware}" + firmware_pkg="edk2-bhyve" + fi ;; arm64) firmware="${uboot_firmware}"