From nobody Thu Mar 13 18:10:06 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 4ZDFsB63RXz5r1bf; Thu, 13 Mar 2025 18:10:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDFsB5Ff7z3prD; Thu, 13 Mar 2025 18:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741889406; 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=XUlof1b62r1rGdBNazpScrzL9IUt61eq/6AE7KzXsb0=; b=EMnJqtVMPVm4aOb8tZStaDZ+vrvaL0v1CF4IkcUhjNL+7EE0IOWQm7I2ooDESs1HIkOjY4 O/cWUNDK+NFqkAXCC6og8zJHPqdTENEbJESSOH/vlp5qwbTmlT3Q7fjoPGtksfBj4+LWSs jIlurqJbYvReQ4UBev3oTeYEIxSA+b6jvh2Mpq7mTIIGHO1dAWN92MKaBzFpn8at/NYvRg REd+c1Psko81gq3TetaHrxyuA7pmLL5tlylAKGP0AKeGZpofzFNhOnC9LxuTfbjXqB27xp 3Ly64rZbdxJFu76PagI1uKt+4faunUx6blp06y+82YwcEq9CHibqYwZh5PRekA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741889406; a=rsa-sha256; cv=none; b=VmC9zJeHJ3rp4HP6/nKd32tepe0Lg4pu4ohj0UgaR34/yOqRBBTrNK4iqCZw3dbMy6KA+5 4p6TGepFgLDy1M4afJE771H8jfAqJvgV38XYuGaVjQauccuBqCbfDxL6ZQF+td+Vkflu9Z 3jfd9uNWAWOmVDaj+PCvIA93gn78mPKpLzEz7ew82yjoxKkabuK/VTXjv8Pd1pmJ+s8OKK U5/FcOZ3O9F3EjGErnBnx998PqXLFVXXrgMcAAixIkMccqW/cPCBhaA/Rof8+kgpkdiu5l 00VjU7sGD2b4E36oxlFYmnw6E4kzvQ1+Xj+poMbFuQy++w+Q3BJYInbnmItH/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741889406; 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=XUlof1b62r1rGdBNazpScrzL9IUt61eq/6AE7KzXsb0=; b=xAc87gRV7fNh+CPblTbDzr3Pjl45Y6adIsFGL5u8cB2yJFLOkTrW3zdgw2HBplqLAzfQ2+ KE3PWvRd3Wt708o665REbX0T9P55Qse1ivvXerxMlqAcHATS4vMgY0VbFj3yGu+WrbyF2O zcLGsMxAGwl/HsMsvqQbuqKfGsLmLbAAvtcb+yCCTdyIL108iRMt2x4wMdoDxbmjZnLdAh Qsm+OcDvPndH0X4/BZ4nZf8jd8RCbLlSeplSVv5spzNsE5DldGwke+zRYHgDbiHEhWFMJQ lHldfGLK22UCPy/Rm+qRlmR1XmpX97t6JybYws/xNY5D2G/j/dh3o1UCU1VZrg== 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 4ZDFsB4dJ6z17xC; Thu, 13 Mar 2025 18:10:06 +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 52DIA6IU080676; Thu, 13 Mar 2025 18:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DIA6Aw080671; Thu, 13 Mar 2025 18:10:06 GMT (envelope-from git) Date: Thu, 13 Mar 2025 18:10:06 GMT Message-Id: <202503131810.52DIA6Aw080671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 09afabd9c0d7 - stable/14 - Makefile.inc1: Make package timestamps reproducible by default 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09afabd9c0d7b89cd711f5de7af3f0841701abc7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=09afabd9c0d7b89cd711f5de7af3f0841701abc7 commit 09afabd9c0d7b89cd711f5de7af3f0841701abc7 Author: Ed Maste AuthorDate: 2025-02-27 13:17:11 +0000 Commit: Ed Maste CommitDate: 2025-03-13 18:09:09 +0000 Makefile.inc1: Make package timestamps reproducible by default Set package archive timestamps based on most recent source commit timestamp (approach suggested by bapt). I'd like to include git metadata in a file included in src tarballs, so that the build is reproducible (including the hash shown in uname etc.) outside of a git checkout. There are still details to be sorted out to do that, so this is an interim step to improve reproducibility. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49165 (cherry picked from commit 8a3537aaf7c19f7331fcc160ab42e36fc79e408a) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index b1a882a042a6..e43b2ff2e527 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -573,8 +573,12 @@ PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif # !defined(PKG_VERSION) .if !defined(PKG_TIMESTAMP) +.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) +SOURCE_DATE_EPOCH!= ${GIT_CMD} -C ${SRCDIR} show -s --format=%ct HEAD +.else TIMEEPOCHNOW= %s SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime} +.endif .else SOURCE_DATE_EPOCH= ${PKG_TIMESTAMP} .endif