From nobody Fri May 12 16:15:10 2023 X-Original-To: dev-commits-src-main@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 4QHv4G55gKz4BBcp; Fri, 12 May 2023 16:15:10 +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 4QHv4G4c1nz4Hxs; Fri, 12 May 2023 16:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908110; 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=wo8iK1cj6tSxr4oIrKPbeZzDCClYu9wcMdogteod5qc=; b=h9RUnFeY8FsZp14zpaCQbgaFHfcnEixIhRPE4+s0tVeIn7dXXuwtwVnhzRHUOP2KflQkc9 U14bRyBju9uaWX9PASI7Q+EhjS8iwCjX9S/fA7g5hb8awVU1FfXPpcJ46txPsxoYAJoIhT aM19hiV79Md50+4f45gyj8hWA7FF2rTPPnkP7R2L7gD8NEh7sJrcD2kbSekDVp/rdIx+bq q908EgQMsO/G/F5we1u1YXcOoC9V9QqSDGjBYtoyYOuDqzadN6Z7A36GPnckyKBEB7bSzO mYOuIU3WgIuSHbb5QlIe2hbGOLPw6fsWnUwN2ahKrFehGZNrOahVoTe4daBoFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908110; 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=wo8iK1cj6tSxr4oIrKPbeZzDCClYu9wcMdogteod5qc=; b=VtsLvpKPwiNqcBIHPCeCBOEQinSVxrU4j9kmV0ePaQDnN+QnEa2kWQLZ+iK4iUZrw/8BjP VIDU6VtHhz5mFxck9j4qnyG7VOiCXyfy/1rAmJLjcTTEf6FNE+3C7MBixpkq088u6Z1W85 wo2CdETLaLmiCykH6heegnkjUpGpcJTQw0BXNKgyzJySA0blyZ9nWNs0/lGJFCER92EdN9 uE4yKLgo3x6j7Pob9/daZW0WxFmS/zHdN0Z1nj5sbK8c+3VMMmzlx7A3YJcc5ZcIK3Bosm NFvXB2EOWcSh3JBq1rCWT6S2anxw2mElwf6MvDY0K4E/2pM4ZVQ+RLozbQOfJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683908110; a=rsa-sha256; cv=none; b=SrSMeakjZHwCVsr++Z2vp4qJZV41kT6G0OU+ulh25+CpYkZWpBGbomtsCSwcpAbcQsHr7b eB7vwA4DBjuxOm+4S1Ke4Y9IKytyI/2VrlSJ4U2PMnbSLit/HcRnJT2zvhPnTeN8oLPwjR L8iaF/++QdgYy/CBPMcEmjHajo9/8W2Vm5YzS2ovvD6Ns73kl1bBA3Ay6j4xCQiovijI3l D+lnYaOuVh81v7J4w0FNCj4pQMDkNZBmOYPNCEPwXBELmLsa16pPnqDb4qKKDXjqVwsCVY 2CzTGtuiil8QwBQUPV9ywu47UmD/PGt9iCdCXM4S54IDYqY6wD4Nk2O8eF1Hew== 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 4QHv4G3jX9zhpT; Fri, 12 May 2023 16:15:10 +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 34CGFA2e012909; Fri, 12 May 2023 16:15:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGFAT5012908; Fri, 12 May 2023 16:15:10 GMT (envelope-from git) Date: Fri, 12 May 2023 16:15:10 GMT Message-Id: <202305121615.34CGFAT5012908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 74674fef3c12 - main - kern.opts.mk: rationalize i386 EFI default with src.opts.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 74674fef3c123d2bcb054f8723ed1bd781972c79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74674fef3c123d2bcb054f8723ed1bd781972c79 commit 74674fef3c123d2bcb054f8723ed1bd781972c79 Author: Ed Maste AuthorDate: 2023-05-12 14:39:42 +0000 Commit: Ed Maste CommitDate: 2023-05-12 15:04:00 +0000 kern.opts.mk: rationalize i386 EFI default with src.opts.mk PR: 269994 Fixes: ad9d10a859a ("efi: mark as broken on i386") Sponsored by: The FreeBSD Foundation --- sys/conf/kern.opts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 53992a31d07c..e61cf9686a76 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -89,8 +89,8 @@ BROKEN_OPTIONS+= OFED BROKEN_OPTIONS+= KERNEL_RETPOLINE .endif -# EFI doesn't exist on powerpc, or riscv -.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} +# EFI doesn't exist on powerpc or riscv and is broken on i386 +.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} || ${MACHINE} == "i386" BROKEN_OPTIONS+=EFI .endif