From nobody Thu Oct 31 04:18:34 2024 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 4Xf9j66pk8z5b0mj; Thu, 31 Oct 2024 04:18:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xf9j64jS9z506L; Thu, 31 Oct 2024 04:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730348314; 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=LgcMe+JHNyav7iX8yrYTOW4ftf2LuV5cIoIH+vziE7A=; b=k8NvRzvCpTC7T8q5BK6oCWCTiF9IsKQkC7hcAvDrp3iCGaXaZ9ahpcfHmPONzF0pYIozxi /Y6n4NBGqtRcZkQxBv318CM0Yk+hQG2PGFKmPP0PWRMf1bkAUyFlaRrgAlU3dF73csp0G/ B5H0aobow+Tf6OAIbkCX6pya5//Mib/cGdvX925gLTmlHJi0eomCxl9+xRIhrj6N4bW/ZH 1i9hB6tv2uO3cPsbtGz0zP/LbmLhzAgY5AQbtkSFyOwp2sGjwNzhTBTZjgNN6Tkf2/mMU1 ZiXeJrSichgZfRv77JELP5hwbrGlePKJc8ckUvrOqU+ZXweZKOsHAfYgWYte+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730348314; 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=LgcMe+JHNyav7iX8yrYTOW4ftf2LuV5cIoIH+vziE7A=; b=qyE/wpE9wFsGk48ujhn9BrBgW+MMkUkHiFfX5iqqkGsYt0KLxgFOpCpv/8AtCgV+HKNL/r F50UMGT0HraUSNFY0ak+EjLGNK8mOMPUZRI2qB73C/L4PTAh0D14tF5ALSxliepASRsEwW Klt1OQYgBtH7UraMFbn4+UvLlUT9I123v7VzDjZXZVnRs1NePq33t4QRpiO0y7j48J32lk iHHBNYXQ6BAOMqErvyId+ippttJ63aaaDnrBKqbJoMtxZNVqq8ER0e9eULwBkG7Iw7r896 serhSdiE+oWfZYjVJkC6N4iCyF7SkWrPvnCWOmtETIgQW3fxRvI3/n5CJcU6IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730348314; a=rsa-sha256; cv=none; b=s+Etf2aNRQjpWFxDvPrXA3gySP5BLwnjvcVCRQDoPncQ760MHqIYNF/lFrm563opM+drhh 5fnl/2hvptnLpzq8ZJHKtMkSqe2DNzfZFcm5TN6JgjUXJCbaibSVhVOX4jbhZheSTbTVzH rSM2UqN6Phzd7JwJnBg2MymEbeVNb6DCg+gcgeAnpnZRXP3eBTjtAC+AcYLq6GyaRHq//s AtnEd4j3ZhaGHmimmlGuO+J6hhh/PmgqRanCiGRK/CTfMMYqgV9hRUz1iyPtInCSnfu9SD yPS4eHO4Rgut6VH4rfVP5NdcHDSA5mzzZIj1eDGsVnxzveXfJ4FwrAb2tRDtjw== 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 4Xf9j64K7mzLpC; Thu, 31 Oct 2024 04:18:34 +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 49V4IYCp052445; Thu, 31 Oct 2024 04:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49V4IYGA052442; Thu, 31 Oct 2024 04:18:34 GMT (envelope-from git) Date: Thu, 31 Oct 2024 04:18:34 GMT Message-Id: <202410310418.49V4IYGA052442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1a37c4e533cb - stable/14 - stand: Ugly hack due to default change 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a37c4e533cb1348ce5a85cbd596fc8a744737d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a37c4e533cb1348ce5a85cbd596fc8a744737d9 commit 1a37c4e533cb1348ce5a85cbd596fc8a744737d9 Author: Warner Losh AuthorDate: 2024-10-28 16:50:29 +0000 Commit: Warner Losh CommitDate: 2024-10-31 04:07:11 +0000 stand: Ugly hack due to default change So this is a gross hack to fix the 'noclean' build since we changed to text-only loader. We have to fix it in a better way, but for the moment, this will fix non-meta no-clean builds. A better hack is to fix this so we build either vidconsole.c or textvidc.c, but some minor refactoring and variable renaming is needed. Fixes: 23dee252daf2 Sponsored by: Netflix (cherry picked from commit 10c429016a3c5adf2e04cfd1ac97eb24c0e7074c) --- stand/i386/loader/conf.c | 2 +- stand/i386/loader/gfx_bios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c index 622812efbb51..bba33a2707d5 100644 --- a/stand/i386/loader/conf.c +++ b/stand/i386/loader/conf.c @@ -134,7 +134,7 @@ extern struct console nullconsole; extern struct console spinconsole; struct console *consoles[] = { -#ifdef BIOS_TEXT_ONLY +#ifdef BIOS_TEXT_ONLY /* Note: We need a forced commit for this */ &textvidc, #else &vidconsole, diff --git a/stand/i386/loader/gfx_bios.c b/stand/i386/loader/gfx_bios.c index a0b08a7cbcde..1581325a81e0 100644 --- a/stand/i386/loader/gfx_bios.c +++ b/stand/i386/loader/gfx_bios.c @@ -22,7 +22,7 @@ #include #endif -#ifdef BIOS_TEXT_ONLY +#ifdef BIOS_TEXT_ONLY /* Note: likely need a forced commits when this changes */ void autoload_font(bool bios); void