From nobody Thu Apr 10 15:59:13 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 4ZYPdG2FC1z5t6N4; Thu, 10 Apr 2025 15:59:14 +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 4ZYPdG0tZ5z3d0X; Thu, 10 Apr 2025 15:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744300754; 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=RBXt0SEfuqFvahWjqP9rRvo/Vf4uwZc0dn4VXYlDccY=; b=dBw9hBnuXLLNoZc6w8jbPSEoDGrYH9RxHQ4lrugvM882wZLlnTbN3YbvOPIJUCMOFQDI5H 98wJK9NZJBikTjz6EiLpZj48vioTZIWsPiJSSNLBW6tGpM57o1JZS41ilIHMfiWtfqLlpn apVQI50spl8/OGvhVjnanOVnyxkrSpr0iRxT/uyxaqiU7V1iUE7GCaCHwh1I5dxBbyRUjP r3txlfZEbjMJ44hd/rehjE+GFkOQl02j1IXnec98+KpBA96PmjlEUP5vWPsCuSFZjg+Pb4 UYfBc040rIJmOiMGQZVvxcHXAnrhpjs6BrPkr2EMXxrRsDE8zjNEXs2aPxGamQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744300754; a=rsa-sha256; cv=none; b=lBo8eFx19SWvwiBpkuFIf0mugCib2W82Xdbl7EcOtFCOc/SqbgexiLvXYveLBUppCFEUy9 xc6FqTwDAIZjSaqF+bacrWJ94GrLbHU8y1U466cPFuUDjOgUXAARGgigsNvdP6mrvCBeeY xvzGpn0xlzdz/Uob+quUBnlPcnEn/dfmSW10xd3C3SUFPynrLKKnr2uu54xV9d/zGixlO2 zlCHHU9ZgAXtg88oHaIX196mXuCNU4je/iqd8s11XQOmjJSfyEG/2Wzh8U8mqG0oSMovjc vCv3gI+EbQ9+zSUaotX38dBTxlm0vFOWqaBeq84SRnRkNTw+eiQpcRAXx32xig== 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=1744300754; 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=RBXt0SEfuqFvahWjqP9rRvo/Vf4uwZc0dn4VXYlDccY=; b=vmJsW70cXtgPVEv53JXtG/v6y/jW+weqofB+gr/1DW2JlAxaqOdAUvE5kVQ4Zx+zt84+A/ 1mZkE9t40v6+/HFh/U/Nw3S1tZteRwOS3IMpqM0B5BU5e6mei2DTCv+7WpRthberyf0XrD FjMw+F9ieEwzNrLa70RpQ0TygwZXHQsCWkLnPX/aDuYUfmDDStsz7JlEaPbhUK7MtN7ZDy DiRYrM2sMjQpa6oZx2zSg6XCg/nDY8r5DFeGyuA1TlEDjAqRJKU1CdzZbDnKtN5fQYGxln T6cVLZ0UWtDtx2f39Nqqe1WE0huPsqKIuxToqfRM4NAbU+BdQbOzyCnG5kFlgw== 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 4ZYPdG0BCtz18Tt; Thu, 10 Apr 2025 15:59:14 +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 53AFxDuX070296; Thu, 10 Apr 2025 15:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53AFxDF9070293; Thu, 10 Apr 2025 15:59:13 GMT (envelope-from git) Date: Thu, 10 Apr 2025 15:59:13 GMT Message-Id: <202504101559.53AFxDF9070293@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: 81ca663642ef - main - release: Pass PKG_INSTALL_EPOCH to vmimage.subr 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: 81ca663642ef1ed5111a88d2e9102f6788fab407 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81ca663642ef1ed5111a88d2e9102f6788fab407 commit 81ca663642ef1ed5111a88d2e9102f6788fab407 Author: Colin Percival AuthorDate: 2025-04-10 06:05:55 +0000 Commit: Colin Percival CommitDate: 2025-04-10 15:58:11 +0000 release: Pass PKG_INSTALL_EPOCH to vmimage.subr This value, if not already set, comes from the timestamp of the most recent git commit (which is now also available in src/release code as GITEPOCH) or 0 if git is not installed. This should allow /var/db/pkg/local.sqlite to be reproducible in VM images which have packages installed (e.g. cloudware). Reviewed by: emaste, bapt MFC after: 5 days Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49760 --- release/Makefile.inc1 | 9 ++++++--- release/Makefile.vm | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/release/Makefile.inc1 b/release/Makefile.inc1 index 552b6cb60f3c..569b72df5106 100644 --- a/release/Makefile.inc1 +++ b/release/Makefile.inc1 @@ -1,6 +1,3 @@ -# -# - # Figure out where the git binary is. .for _P in /usr/bin /usr/local/bin . if !defined(GIT_CMD) || empty(GIT_CMD) @@ -24,13 +21,19 @@ GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --first-parent --count HEAD 2>/dev/null || true . export GITCOUNT . endif +. if !defined(GITEPOCH) || empty(GITEPOCH) +GITEPOCH!= ${GIT_CMD} -C ${.CURDIR} show -s --format=%ct HEAD 2>/dev/null || true +. export GITEPOCH +. endif .else GITBRANCH= nullbranch GITREV= nullhash GITCOUNT= nullcount +GITEPOCH= 0 . export GITBRANCH . export GITREV . export GITCOUNT +. export GITEPOCH .endif # Set the build date, primarily for snapshot builds. diff --git a/release/Makefile.vm b/release/Makefile.vm index b5ec044fa94a..0b5f5e714cc5 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -181,6 +181,7 @@ vm-image: ${QEMUTGT} QEMUSTATIC=${QEMUSTATIC} \ ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${NO_ROOT:DNO_ROOT=true} \ + PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \