From nobody Mon Feb 03 23:58:41 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 4Yn3Ny0h7lz5mhPd; Mon, 03 Feb 2025 23:58:42 +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 4Yn3Ny00PCz3xCy; Mon, 03 Feb 2025 23:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738627122; 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=ZUCjKErcJN/ldSv31HzyHrQDdoQdE5hVajIbwvPci4o=; b=LMVvmETiZ4gDVg4uYnR5a97vSFEcTumBLS87X8wT1rqfAvY553+Fiv9EKEZMetLVVPGW+n /zuoy5h9leokb/wXeu1Z8qu6+TMwqK7aZUZ7RStfb8AOQWkgkFhTtnPEbneNdSqenAW8u6 5BV/vwMleVUX1jh274Ct2NefaUaGjNdzcO9kgdEr8NGOYTPm518LnmimhkMLGxNJ5Jv5Dt q7B9AWmWVLEGWiRpktn8KY+0SCoNyk8T+wA5slFJTgZ4vL+F44rWnu4IG204kZw+p6Bs4V IrCdB1mMGTgM6j/MqzRQ2yaN+g/Lwc2IU4hkVQqswe4OkKKKBAblIst8C0CaqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738627122; 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=ZUCjKErcJN/ldSv31HzyHrQDdoQdE5hVajIbwvPci4o=; b=RiwSgd4Sa8W2JO+tANqgMDo557rgOhO9rN1JXJ3uxQ4RLAlUuiQPwf47/AUFrhh31IivuV cpUJMCHCUxblE7LERlqZVii/T8tPLQ9AXKS7fx0gDhRq3QqloMiVrLxPbM5JXy34jtKUr9 1K7su7S3s9ls4dMed/C0yS1eET2r8WI/GUST7QiicGN6/MoYVEMkmxiG7VkGyPCj5Lr3mO 4oVcEHnnRb4ctdEma8KbkzIpUVyW2mNNUncFAWhfLWRxz8mudx2O7OLvgEWPuUTabvaQ1b iEnAE5GtgNEEJFYxiA3mSqghEyHY619x5Jkk/t1ZqIi9+P6cRX8h61L7Uzuq9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738627122; a=rsa-sha256; cv=none; b=h0Y+G+eR26bQXxyanxwVSdLjviPc1HVeVixR9gyRwiumPUcKb/4MaID+xcY46ZL5ldneKO dGDQs0qwWuRiKBpt5bKhIaUUqwJgKhbiFAK1nl+hsz3DUbhfvHQj6cf5uHMPH/4PBhkPHT Xz6L5Sm6us0KRW/zNr3DDs5ZQIM7D4lhWe9HfwgYnuIx5rIclTj2n631BSoDdmFpO8EL/D PF72Kru5I65zIf1Pt5NKrYvRa7BVC34lXxmjN990TE05thK8xVd7ZifWuFlBURiT5VLn3a 4jseNjH3b1K3KFE5Zj27pTan1kpiep5sH0BsxiMRznND6iMwWX3LUIlsKpLOUw== 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 4Yn3Nx6MSNzyH8; Mon, 03 Feb 2025 23:58:41 +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 513Nwfnv040196; Mon, 3 Feb 2025 23:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513NwfBL040193; Mon, 3 Feb 2025 23:58:41 GMT (envelope-from git) Date: Mon, 3 Feb 2025 23:58:41 GMT Message-Id: <202502032358.513NwfBL040193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 44a768e1a80d - main - stand: Use SOURCE_DATE_EPOCH in newvers.sh 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44a768e1a80d9e4f06d07fbd9025e63622a80de0 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=44a768e1a80d9e4f06d07fbd9025e63622a80de0 commit 44a768e1a80d9e4f06d07fbd9025e63622a80de0 Author: Colin Percival AuthorDate: 2025-02-03 03:37:56 +0000 Commit: Colin Percival CommitDate: 2025-02-03 23:58:32 +0000 stand: Use SOURCE_DATE_EPOCH in newvers.sh The newvers.sh script is used to generate vers.c for 10 programs (at latest count on amd64): 4 EFI loaders, 3 x86 loaders, two userboots, and one kboot. When building without MK_REPRODUCIBLE_BUILD this resulted in 10 different timestamps being compiled into various files. If SOURCE_DATE_EPOCH is set, use that value rather than the current date and time. Reviewed by: emaste, imp Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D48803 --- stand/common/newvers.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh index 369a1c7c76df..c244e718c041 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -43,7 +43,15 @@ done shift $((OPTIND - 1)) LC_ALL=C; export LC_ALL -u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} +if [ -n "$SOURCE_DATE_EPOCH" ]; then + if ! t=$(date -ur $SOURCE_DATE_EPOCH 2>/dev/null); then + echo "Invalid SOURCE_DATE_EPOCH" >&2 + exit 1 + fi +else + t=`date` +fi r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` bootprog_info="FreeBSD/${3} ${2}, Revision ${r}\\n"