From nobody Tue Jan 24 22:12:07 2023 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 4P1h5z6qF8z3bfjT; Tue, 24 Jan 2023 22:12:07 +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 4P1h5z5zTkz4QZh; Tue, 24 Jan 2023 22:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598327; 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=dMp8QrdOAavWHaDLQb8tBOFoQez/9Vzs1jj88BxK/i4=; b=Q7gOrfjubY3tti/Zf6tn5slP1KY70O+kmYSxb+7OSAU+bf0bkWIqxHbtlcD843hl/0DLin u8XaCIpVfZ9GDb1pxaz35yuI6D6EeisXu4tx0hsc0EFkUKvphfpvlY8h9XXUicvOMvIp6I MM80ltR9NCbZlSpBWc9UihvFSbyzmzNq4y8Ic2NoQvmYblsQzMV0pkYVXDFlxy2HyW3DQL kbppcUOTvWsl4fOZmCfNBqZW+dBU7XZ5AnOIRgtC9Mn4uoMLAOvSAL1jN+XEUFBikLnuVr 0Owibggq206yyJnjt9OlXZZSpwqOqO2HsWqeAa/kMjAaPz3VyVgTnTZWk4UquQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598327; 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=dMp8QrdOAavWHaDLQb8tBOFoQez/9Vzs1jj88BxK/i4=; b=dhk6adW9daHuyheOXQSbLO+VIinDKiOEhHLMcm3emPsBNncj1QvSRmYRbrAL7sNrhLu3QN wBwhMyCPEDQgUqhi6iDODWDq7TiH38Vin5sFN6G9wiWT+777FjFSjtcz80RE6CFg8+m6Bs hUL/z+AiGEK07WRkoGBYHPzeHxknptHpfM5SMI4t216n0xGxDdgjc9j51C/DZe9lLX8n5E 7JGub+yHH6ygZRIN2rozFUCTBO14bEEDeTFb8vnUp/hPZfALn5B0b7uBf2fPRXIHcrMH5Y li6Tfjm5Gjmj4PoSRTwT5AicP51Z9616IYeUhjSbvASh2yOjwAIgVSHGEcdLQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598327; a=rsa-sha256; cv=none; b=qz0zucdr3pRizQLiwXvq7VNQ6nsi45vVcpdfHsQQicueDU0RyYjvn8auzOfkpglnAWsGdQ TTQhNyE+vQDioEmvuibGsN1g9vi3Qqvovy2NG+Vyb59ccxnaeWuhae0/iFXxV4Eb1VxGeB LEWDJJrFpsKqdd6K/nEOiJ4FNe0/MZgfjR8uTGpsWROuJYYlEDBJPvDfQmsGPBHHqQCQew 2LM3YFzm2dm4RpK4V2NBKDRPp20/TaBlfq0RpVfiC4p2/FqLjFAr3vo4W9CrWuFEs4RpOL 9pljuFbG12MjYimSdkMSmGJTkpMopQco7Sg61Vnhj5puwXNsDZVWwstLMBnIng== 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 4P1h5z52L9zQGq; Tue, 24 Jan 2023 22:12:07 +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 30OMC7BW086592; Tue, 24 Jan 2023 22:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC7Wx086591; Tue, 24 Jan 2023 22:12:07 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:07 GMT Message-Id: <202301242212.30OMC7Wx086591@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: d89d0858db60 - stable/13 - stand: Make BIOS loader size limits settable 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: d89d0858db605e32a0079126c756159abad09b69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d89d0858db605e32a0079126c756159abad09b69 commit d89d0858db605e32a0079126c756159abad09b69 Author: Warner Losh AuthorDate: 2022-08-11 16:24:58 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +0000 stand: Make BIOS loader size limits settable It's sometimes desirable to override the size limit: It's a soft limit and there are times we exceed the limit by just a little bit and don't want the build to fail (or we are hitting runtime failures below the 510,000 byte limit). Sponsored by: Netflix (cherry picked from commit 7d72ff905770a64a22125c890438189db71104ae) --- stand/i386/loader/Makefile | 2 +- stand/i386/pxeldr/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index cde1513aac06..8b027b2edd61 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -19,7 +19,7 @@ PROG= ${LOADER}.sym INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 VERSION_FILE= ${.CURDIR}/../loader/version -LOADERSIZE= 510000 # Largest known safe size +LOADERSIZE?= 510000 # Largest known safe size .PATH: ${BOOTSRC}/i386/loader diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index f8bc1eae9a31..3d27285968ce 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -13,7 +13,7 @@ BOOT= pxeboot LDR= pxeldr ORG= 0x7c00 LOADER= loader -PXELDRSIZE= 510000 # Largest known safe size +PXELDRSIZE?= 510000 # Largest known safe size .if defined(BOOT_PXELDR_PROBE_KEYBOARD) CFLAGS+=-DPROBE_KEYBOARD