From nobody Thu Aug 21 15:58:20 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 4c77Jr6F23z65KwH; Thu, 21 Aug 2025 15:58:20 +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 4c77Jr3lCWz3Lwf; Thu, 21 Aug 2025 15:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791900; 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=GjYrJgqWGOcny3iQ37B2S2YYW8G5pEsZtf7gyJxyXKI=; b=NzU8BVJcd4QKmo83+2fS2UcIfjAC0zSnNNXOtBaDooz/KBHHCRYAauhdODfXE5I1PzdhP/ rAhPy2rRmpSQ9gU+ut2o5l7RV9b+SLDN9kmfS/MTv4ICy9BUiStpGCkB9SIrA4BzX/qw/T 4t8VGMcqqVjgZGYREg8rIZV5e/t4ghhtLF7pTc7KTQKo3Ct+FsLveW/98s4nxzea0Lge/8 hp2TZFQLgJX0raqBgGyPmgSdKfnXWsLPMExWAXpXWfD2FxKzz6PnkMRVMEaUlm0VoBu1Ab pULyzx8XRBsjVL1D9A3T0JHLNFzf8IFD55DhyhiuAeSmP+YvOZlsydvD2EBNLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791900; 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=GjYrJgqWGOcny3iQ37B2S2YYW8G5pEsZtf7gyJxyXKI=; b=Z11GmZjtp5VNVsvmGyhTBYpVN8gqpNblfXroX0WasjjtWtMPqjzeDnAnhlNjKXKOhrbU9g EPYKmDH15YiolLOgBcqqaf0/GE6eULpeAggNGkhGo3VBYL0ERFHKQ4gv7Rbm9V3arVYBjl rmDd+1hVvHaVx+ylBF7surP8BRXcD2+DVpm7YFsid0w3u0/HxeDkONtkO4ftYnY29fa1F+ 01SwLs6fmRnuab/K4Vxx/RBIaGJ9NtWsPvaKN7q4W3dFOKCOyF7PTCkIeZOONmZr7FlyMC twsC6479hAJzo38uhxT0rVwFJUqFZ+AnRaBKZ42H7mb6+mmX4ALj/g6hG/UESQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791900; a=rsa-sha256; cv=none; b=XV04zXbXaH0ODa4vfUxZDdX7+BVvAgk4yO2E2Yc4+fBheYKZcHPZ2RrJ6a19j98o61kjQY i1OnOctfH3C4jHvvjqzWIUenbkZVq7jtajALDlKXSELYC0f0EGU704a4BMZfiSQaiMko7Z nN/D53F8EMzpkJCg+rWxMB65iEX7f/ZabL4EPIQHDJQv5aS/NoaRFg/7WFEbFG7lTYALut y1GqSXD+siWhx+AbPNDuwWT6dOuJzr8gDPi3K+YHTv5EFye4Up1tp6IZRvZg8dRcOghtpW mG2XbF3f9gBKg2Hg4aRSpCglqntixztGG1z5oRA9asJIcK8VMZ4FcXYHGYUjMQ== 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 4c77Jr2mYPz15GX; Thu, 21 Aug 2025 15:58:20 +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 57LFwKhn062728; Thu, 21 Aug 2025 15:58:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwK9r062725; Thu, 21 Aug 2025 15:58:20 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:20 GMT Message-Id: <202508211558.57LFwK9r062725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3238878379d3 - main - newvers: Add a builddir parameter 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3238878379d3bd4bb9796ccb41c090139bbde94f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3238878379d3bd4bb9796ccb41c090139bbde94f commit 3238878379d3bd4bb9796ccb41c090139bbde94f Author: Mark Johnston AuthorDate: 2025-08-21 14:05:19 +0000 Commit: Mark Johnston CommitDate: 2025-08-21 15:56:23 +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 --- 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 1accd3fa8df4..bb3c7af82a4d 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -467,7 +467,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 66926805052c..8b60da95741e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -110,14 +110,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 ;; @@ -187,7 +191,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 -ur $SOURCE_DATE_EPOCH 2>/dev/null); then