From nobody Mon Oct 28 19:51:59 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 4XckYW60Czz5bjft; Mon, 28 Oct 2024 19:51:59 +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 4XckYW5Ynrz44hS; Mon, 28 Oct 2024 19:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730145119; 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=Ew9yZw9FJ2fCZPZvEnrUvF7WDgwsuZ5iChuTrnX9hQw=; b=SI8ayndGvthyUPobw24qj9QqJtGUklTajbgJPpdQVGz5U+L0engD9+/Ev9zuQJQ1GVb1cR a17GAPTM/zyTQGkOkBBANw7Ix0i/690IJ48F2CoJZDVIYFGf2tIbsK26+sRnkhtm195rPe pTM2QfZJL6JaShzlWAuAXPDUClu860cNHiKXLsE9cC7AdpFG84dnAwmwtpu5PmlXwBNnWZ mvdr26PQEGy6VnL0JX6iSxW2vYOQdN1fwjld2oYcC+MO6SBQK1nuHlRKnCHOa4h1nj9yRB mPGyWY9bbyngpFZ2tCet/OkeDOg2RvU5bGeJecVN+2GskubphD1tkb/+Ob5fQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730145119; 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=Ew9yZw9FJ2fCZPZvEnrUvF7WDgwsuZ5iChuTrnX9hQw=; b=wVltTK6DMJovBZlLjHGN3ktYNx6uM7sXk4vWjq+/hC4m98xEKzlkMj2Ru659nK77YlWwmM Qw2hSwGoxv1attagSXWfYp9HhGtA5nNYxON/l9KpzDZG04QNryrWKamcVIvyZAdrIL2BKj vfof6tYJmA/UrqOmqpofIYXzDc39qWz/ijwCBEAJ2XJoeYfB131KxqkUb8kGd3Ft9ddD4u 3PMWE28ll7mu7WIFdwuLrb5VFoPKWQW0iWwBD1h++sosQHnMwXTauAAcKHerHl/s8mrTSA W+P3BW1VMLO0gPkFRLRTDPGEDbSmScsbWH2j3/tPyzQn4K2figMTPIdA89LZqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730145119; a=rsa-sha256; cv=none; b=XSjRcnxs5pFneRD+S3Is1jJYP0yGDw1UjnbfQ9YZGy/08ffPV3pFuWZfeKo4nH73fYk7y+ zxvDioOP4YCGP/gRadgcelQHxIqyj753+GwGNm8aOepNLmJO78Im4bcrtwLgllcYZfQVRV 0bpTBbDdLMQ3H15lGMZoXTHkOwydWC+35tK57w6dQsXs158XRbcnZFeGEWI351wVUCnqkP mGKNy4l1qJmt8SmDjGqV+VcyeEtn+lQbm1azGCkzfqcn7mnjQEVm4ye84W6te+37hrCRVL /S5xq6e25WsgQDcChCPyZbF/e1YWwlugrPrd+6s3MtpVn7yDgrghrHbgtPRY/A== 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 4XckYW59Q8zsm6; Mon, 28 Oct 2024 19:51:59 +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 49SJpxGj070429; Mon, 28 Oct 2024 19:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SJpxvp070426; Mon, 28 Oct 2024 19:51:59 GMT (envelope-from git) Date: Mon, 28 Oct 2024 19:51:59 GMT Message-Id: <202410281951.49SJpxvp070426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 10c429016a3c - main - 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/main X-Git-Reftype: branch X-Git-Commit: 10c429016a3c5adf2e04cfd1ac97eb24c0e7074c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10c429016a3c5adf2e04cfd1ac97eb24c0e7074c commit 10c429016a3c5adf2e04cfd1ac97eb24c0e7074c Author: Warner Losh AuthorDate: 2024-10-28 16:50:29 +0000 Commit: Warner Losh CommitDate: 2024-10-28 19:51:53 +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 --- 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