From nobody Tue Sep 30 21:14:42 2025 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 4cbrRR4lWGz69LRF; Tue, 30 Sep 2025 21:14:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbrRR0bZHz3tJ5; Tue, 30 Sep 2025 21:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266883; 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=kJh80HETCpAeiFsvGxVO+mhyZDmhHvKfne5gmOl0Hew=; b=AfrGDfIbRsDPwqN6KV6R3d3j1FVoaAJXu/zUpzz9pkYdSuKiYBSGtjsN7tR9ZdGnBiNYgj tcGa1HKgAaAP04m9XZkbiwf+umojc6JxS9CPOZP8GGzjhAoELy2UQOYXWc4crYhd66Tttk L103A/h+XG0iwqJ+OgxJADlTkwopYF0wXe4FJ8Sf1K0Zfjj1crhpJXSgY9xvPihGavWvKm e0BNRC4wh9K7Mqo+7m7DF0Rq7i/lDrJhivbEMvew3sInYTAvIwNovbkGREc5zEgj6q1EiF T6S7DkRUWOFFop/AnbFyvTftBlJ6ZQEB1fh9BvMqUlWRcU4+QnoWbYYrn2RrDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266883; 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=kJh80HETCpAeiFsvGxVO+mhyZDmhHvKfne5gmOl0Hew=; b=YRFlWLn2KD1YUPI7x1LqREhnhjGHs48/SHrt5+AofS0pxqcp3wc/nRAaB2ts11lqOli/6x Q6yw7aKU/EfaofZ7kSobKCuBJ7YSGndL0luEm2lcBfERe0gngrGbyCSpoZNtAxnOu3dmm7 ALvaC9oYt4viwW9P8djy1tvaSL2PLVDTM2h7AioihyO8FL0F8WjhSnWhsKdKaGw9e5WFDe TKIgXjgU22SjShofCHuMOrgICkaxblkY67PJqfiSJK1uj6dPTACEP/k59s/V22m0cZWTTN srytugt829wA/PCtCAGfLFtCZrnGlr49LL7l4aQhjyu168x59feJImy4BKGv4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759266883; a=rsa-sha256; cv=none; b=E+fbrwSxFRMnfIsxz0fI1D+rPkRn8lJVsQuEIRXguym6L4v4rOWbhYK6hFJbx89JGFFXzN QtZ/yoyiTjw93QHmFd9agWUNSlZNEQQvgO031cC9dJ0qi3OF7CdSsDlKmVAfaVPnCFyZxe T2xSkiHwYp/lfjzC5Inwc3I98KJntlbeVXgFIH0vsxzIYIT9y4mrJdM5Q9/pA7NW/mULTM Rm8+b+TBnFwz04SoFKWldgfEya1QlgIxHcSkGfaFUah7NNYgsqvsVxoYjYQhkslo0Z7N/E uYh469x+adp4ASvYU3HNRxbdkvK5CPx9MG7UsCLn9FQMF3NZA0anxNl9FQMrkQ== 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 4cbrRR08cZzsqc; Tue, 30 Sep 2025 21:14:43 +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 58ULEgnY010432; Tue, 30 Sep 2025 21:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ULEgLp010429; Tue, 30 Sep 2025 21:14:42 GMT (envelope-from git) Date: Tue, 30 Sep 2025 21:14:42 GMT Message-Id: <202509302114.58ULEgLp010429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: de659254dcb6 - stable/14 - newvers: Add a builddir parameter 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: de659254dcb67d5992f65f2450e5a704553e0f65 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de659254dcb67d5992f65f2450e5a704553e0f65 commit de659254dcb67d5992f65f2450e5a704553e0f65 Author: Mark Johnston AuthorDate: 2025-08-21 14:05:19 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 21:14:29 +0000 newvers: Add a builddir parameter When reproducible builds are configured, we should use /usr/obj as the canonical objdir. Add a parameter to newvers.sh to ensure that build metadata is reproducible. Reviewed by: emaste MFC after: 1 month Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50954 (cherry picked from commit 3238878379d3bd4bb9796ccb41c090139bbde94f) --- sys/conf/kern.post.mk | 2 +- sys/conf/newvers.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index c4e1c9edb65d..a4c6f6fc187e 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -460,7 +460,7 @@ config.o env.o hints.o vers.o vnode_if.o: NEWVERS_ENV+= MAKE="${MAKE}" .if ${MK_REPRODUCIBLE_BUILD} != "no" -NEWVERS_ARGS+= -R +NEWVERS_ARGS+= -R -d ${PREFIX_OBJDIR} .endif vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*} ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT} diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f93be1990cf1..13f6c2de9bde 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -112,14 +112,18 @@ COPYRIGHT="$COPYRIGHT # We expand include_metadata later since we may set it to the # future value of modified. +builddir=$(pwd) include_metadata=yes modified=no -while getopts crRvV: opt; do +while getopts cd:rRvV: opt; do case "$opt" in c) echo "$COPYRIGHT" exit 0 ;; + d) + builddir=$OPTARG + ;; r) include_metadata=no ;; @@ -189,7 +193,7 @@ fi touch version v=$(cat version) u=${USER:-root} -d=$(pwd) +d=$builddir h=${HOSTNAME:-$(hostname)} if [ -n "$SOURCE_DATE_EPOCH" ]; then if ! t=$(date -r $SOURCE_DATE_EPOCH 2>/dev/null); then