From nobody Thu May 22 22:48:34 2025 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 4b3NkC2Mx8z5w2ww; Thu, 22 May 2025 22:48:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3NkC1ll6z3gfw; Thu, 22 May 2025 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747954115; 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=kknLfD/6WDMKnyz4iTvyAHMawVIgqSftf20mpkPzye0=; b=GOyR1i2fOIP+BEy6whABYC3wexKHJp/C/C2jIjA3Icw96n0/zigzRu9kUA/IFA/49f2GPM 2zzS/c/xO2w4Sgci5YC5biAk6E45rW6RQHEcOObhgxapNQa20/4GVvu/YuXcQS75EXwAUw uev7pUBAQJAPCDiuu3Aii80hy5iS4gMPn4/pAou7GEmt0CYiBgjnkH64990cjAJvKWUKmB f9DFtvgnZBx5KlQpymvwQKQE9w3nt2g24pHpU8nD7SAsv5RE81+N3lmFNT0mzPZJJf+dnJ Wz3lU9czxQYJRKLZsT5DN/e5QPuCYVX1HU/6xB1FKx5VARLF2/IKY7vawiXyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747954115; 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=kknLfD/6WDMKnyz4iTvyAHMawVIgqSftf20mpkPzye0=; b=tr2bT1Ab/KLJv0pxUFvjrG3ET9htO7t/v1p10EYscnsnfG6Gs6kqzqOFkxkbNB1AvQdx5+ iYr6dNSce5w2NYcxACu45qsoh3RQs6Qnps9BvArEDIu5ZI7y6EhzGCAe0uIKoBpvqrZwFm mktaPLnFvc/oESKWTIFr+xb7tnRT/6FkXLNn+sjjphrMp3/IIlm4WU0KoRgkVFLwOykFo/ LIMPeqlcwhTYie2lLYT6s5TZeDZKXz6+GE1Qcr4VGOHl9+B128iNAJi9P8Ah/q8tFYTsPN LQWG3J9OEs6d+RVTbfUoxZgE2SoqNYVtdMP4rMVijXNJEgeHAcMGeX5DQvb80Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747954115; a=rsa-sha256; cv=none; b=PbvuxdLwKNxsUQUuRAIIem2ZwbxwaYNJBB0Gxc0HWHB5+WbTm+fknBaBl9hw+sxiY4N8GP ddci22p8b6f/794HuxTWGiuvpn+FhJpfblc98EHBufekduzIeIWcx8cB4Vvi6gu47qNvMM fKWtGBcs48wWJqaD3ta1j6Koe3SI/c3e4CCiJqczZtZcrKtRev0aAPfXU8R/E+WXdttWep wzany88y69gKMyoxIfoLU5L1a6cviU6KeuGYoVKKp/8YVI0gvyzaGO1RQgTy8id24Zbe3T D70CNTpNDzu04iJa10vnD5mjy8rqAHVGaA+gHb2jSQWp6m6uEjKcZ/ffaKXUQQ== 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 4b3NkC0Tnpzfxn; Thu, 22 May 2025 22:48:35 +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 54MMmYFI036060; Thu, 22 May 2025 22:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MMmYDc036057; Thu, 22 May 2025 22:48:34 GMT (envelope-from git) Date: Thu, 22 May 2025 22:48:34 GMT Message-Id: <202505222248.54MMmYDc036057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2982c7085239 - main - stand allow for local.defs.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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2982c70852395fad40959072ed90c8676a4b9a1c Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2982c70852395fad40959072ed90c8676a4b9a1c commit 2982c70852395fad40959072ed90c8676a4b9a1c Author: Simon J. Gerraty AuthorDate: 2025-05-22 22:47:21 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-22 22:47:21 +0000 stand allow for local.defs.mk This allows us to change the VERSION_FILE used for loaders as well as set NEWVERS_DATE and BUILD_UTC to reflect the publish date of loaders for secure-boot. Sponsored by: Juniper Networks, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50478 --- stand/common/newvers.sh | 6 +++++- stand/defs.mk | 2 ++ stand/efi/loader/Makefile | 2 +- stand/i386/loader/Makefile | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh index c244e718c041..8541d61ed76c 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -50,13 +50,17 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then exit 1 fi else - t=`date` + t="${NEWVERS_DATE:-`date`}" fi r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` bootprog_info="FreeBSD/${3} ${2}, Revision ${r}\\n" if [ -n "${include_metadata}" ]; then bootprog_info="$bootprog_info(${t} ${u}@${h})\\n" + if [ -n "$BUILD_UTC" ]; then + # We can use what(1) to extract BUILD_UTC + bootprog_info="$bootprog_info\\0@(#)BUILD_UTC=$BUILD_UTC" + fi fi cat > $tempfile <" $$path ; \ ln -fns $$path ${.TARGET} .endif # !NO_OBJ + +.-include "local.defs.mk" .endif # __BOOT_DEFS_MK__ diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 2dae035f04a8..ae2ffc475730 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -87,7 +87,7 @@ CFLAGS+= -DEFI_SECUREBOOT .endif NEWVERSWHAT?= "EFI loader" ${MACHINE} -VERSION_FILE= ${.CURDIR}/../loader/version +VERSION_FILE?= ${.CURDIR}/../loader/version HELP_FILENAME= loader.help.efi # Always add MI sources diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index e1f0298403b3..96ad50a75509 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -16,7 +16,7 @@ LOADER?= loader_${LOADER_INTERP} PROG= ${LOADER}.sym INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 -VERSION_FILE= ${.CURDIR}/../loader/version +VERSION_FILE?= ${.CURDIR}/../loader/version # # There's 640k - 40k maximum space, less however much memory the BIOS uses. A # non-random survey suggests that 20k-25k is a good value for 'most' machines.