From nobody Sun Oct 19 13:55:32 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 4cqKnx1dwPz6DDV2; Sun, 19 Oct 2025 13:55:33 +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 4cqKnx11d4z3T00; Sun, 19 Oct 2025 13:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760882133; 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=HBqfdVldY4tBBRoOfmzaBwd7r28qf+UXJGHDj+IcHhw=; b=Ba9Jp2ZHd5A6cr/73BxE4z2FmSshGtcp++Gemmtwp8HYARHQIzq1BnJQst3DKDfhJ/F45M 7AoDiqsgYup8gIX71dTi/up3iRSn/KdvWfD47wgs04g8wTMx8hnPBvlRdiBKxB97mBiIvQ CyKINneqmBCeDEw2tYWaANu+q3Kg3GM3awSsBdfLJmwrNTuhg1aGBKZIrHzmxB20RP+Xsa YxWd9w2BI2Y0DZjBf6wbaY5X5qTPsBiBSc7o35HluGmSUHwfkTJWm6esGdvyy20MVczism Hdu3ui7IdFQ/rWo8zWJlmX7ZV/qzCTHWvnSfjGkpZvYzjthhGNqo6grRCUAIOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760882133; 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=HBqfdVldY4tBBRoOfmzaBwd7r28qf+UXJGHDj+IcHhw=; b=Py2/d8sVUxqo49cKIcd26NcBQLAKR9uA3emkPaMDn4K0NFG7/bNmqOPTnhl4IDuXRiecSF UJ8a+ixabL/7Tp0C6x2MqV3PJ7Bk4/zDNXpbVPrWDpZKxBz1dUDWzfe0QVQh25+MWv5+fB H0N1PHwEbA+96n/BtoyPzYIMPLcamf8FelKwtmqucw25vbZ6sc6qUR7mHJKDlujACR5zxM dNxqQ/2kDBqVuhbnj9hPVlDvTt8ILavQp3R0TWMC81q68o+G7AflV7RFoMX9A1x6cbX205 fq1Z+qgC0w0RUj3O5lJeVPyiDGu3zCbeMD8UUFaF9x6TdQvv4OJTum2MZFtbzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760882133; a=rsa-sha256; cv=none; b=ImQCrNUI+yO0FT2zQJ4Hk8B1J4TYPaY1ijkIrgtDcF5a6CjGufUJKi53x4IJQN3TaINbBz 7UREKC/oSApgNBX9FZuMu8579vIP/46KePR6DnYvYlkrRTz8eZ9R/GZyn0Vjc91L+6REwo 0Nreu9iK23N/qgdbUUrWol2I5UdyCzwyZs0tLoJjrRcor1mOmPC1aFMjocKAkUxdqmCWEO ge7jps9JLfgGogjoEp4AiUSy8b3Xqaxyeo8/Vo2TC2Qrrb3xQb+v3TNcK9JobKtZoTFqrj VPLelAqgd5jNIqHPzDMrZChogb9XwKBuwUnFSoHh+CqJ8LuCEOjKJ33GToP69g== 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 4cqKnx0TPWzTyv; Sun, 19 Oct 2025 13:55:33 +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 59JDtWlD061022; Sun, 19 Oct 2025 13:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59JDtWBj061019; Sun, 19 Oct 2025 13:55:32 GMT (envelope-from git) Date: Sun, 19 Oct 2025 13:55:32 GMT Message-Id: <202510191355.59JDtWBj061019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6c5540eebcf2 - stable/15 - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6c5540eebcf25e3f81c3ec9bfa762390d2a86885 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6c5540eebcf25e3f81c3ec9bfa762390d2a86885 commit 6c5540eebcf25e3f81c3ec9bfa762390d2a86885 Author: Mark Johnston AuthorDate: 2025-10-16 14:48:39 +0000 Commit: Mark Johnston CommitDate: 2025-10-19 13:55:06 +0000 vmrun.sh: Don't require firmware on amd64 unless -E was specified PR: 290232 Reported by: David Marker Fixes: aa34b1d20e44 ("vmrun.sh: Add arm64 support") MFC after: 3 days (cherry picked from commit f19f17b3af675fbbc1244b66bbd8fb4a9836cb02) --- 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}"