From nobody Sat Apr 26 19:21:45 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 4ZlKMZ2lQQz5tfSk; Sat, 26 Apr 2025 19:21:46 +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 4ZlKMY6XXYz3Fp8; Sat, 26 Apr 2025 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745695306; 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=CG1Rol2DmL4oKFmLuP/bWFXchh5Qnrrh+v5ZrNQcS7c=; b=KZluVp2Y95ypbxV7SMIwrO/dgqEZQzEYtU3Ry8esqffuX23sa3u+u64q5thVsETVfqoVjA oyL/8h3S4qictdJyzYuTUBMoT8y+bJBaqLJRulx5Km/P6+balf/UdHcznpGnQRvfQFWooe I+Os/gnT8qcB2zHv2v5NT3434OmsvYC/epKsbroqVf10hxyjrqNAENV4gTaMGuHdGnehbi xlYwA/M7aeYb3fBcq9kyQKKbV/E6JEMEqz0G6jVpgqDi9EqWGX2GGvsu1/Gtmmp2h/vgUN jSHPV86biUtc4M037r3IpfFD4olG7ixUZWkiuup3Q9sHbq7QwyYraqvJWjXr3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745695305; a=rsa-sha256; cv=none; b=AvTNABWiQShruBszDYuh3JyuVAkHVZCft/wzgd089OtiOc/tkYEjTLvxYk00Qn8+Zjl0uO 0Y/qNduIpcIG6P1FEONHLS2IaNCZypS6MhkJVIE6O/V74sp5YwrAgJziHOo6tjV4fV5n9r 6jFQtmT9KYSVg3W7S8RQ6tNav+B8Y1oW+e4C8TEuAob38Wq4eeCiEpqetOsaGfgJt1705E Okm89LfATQUIpIDuwzCiVimOzLN1wFU1T07vkO3hzgfADYfyMDFbcLRuSIoZZt+Zxhrvhc WgOkv0yzyTxPy+iyl1zhhgvJRn25cMRosirGp4EH/UzznpmLEfy3WQe2S7LFDg== 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=1745695305; 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=CG1Rol2DmL4oKFmLuP/bWFXchh5Qnrrh+v5ZrNQcS7c=; b=X9Y6d3tGSld00TIJ+BM90yIDv2CM74xVw15JL/TWrJ9d2iE7jJhL6ptxrT9m+ow533HEHs +Jshu/fZNF3MrWLLu/L7+MRmS4mznsEqQYyGKz78KQ1Q420uu8OjOyjQ7lZ0s/NF81uoDc bqG7SQIysijI5wlrNawqf3WxD57/VGl3muC0ep9D7Q1UVxCoXMet88XI8SA71TpMGsm27T q0zVRfy9f4C4GEL2sFHWEQcywLXDLux39W70kyRhhY26RuhwrjkV/3PLj8CliYlAce+p6g suEBMl9swV8kBwzgHJrkH8cR93/4NLrOKlGP/aVw4UzE4IjlDk+lCpnt2nc6CA== 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 4ZlKMY62GfzYr7; Sat, 26 Apr 2025 19:21:45 +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 53QJLjFY009527; Sat, 26 Apr 2025 19:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53QJLjo2009524; Sat, 26 Apr 2025 19:21:45 GMT (envelope-from git) Date: Sat, 26 Apr 2025 19:21:45 GMT Message-Id: <202504261921.53QJLjo2009524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5050b464aeda - stable/14 - release: Pass PKG_INSTALL_EPOCH to vmimage.subr 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5050b464aeda1d775a5f36d000daa7473a214977 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5050b464aeda1d775a5f36d000daa7473a214977 commit 5050b464aeda1d775a5f36d000daa7473a214977 Author: Colin Percival AuthorDate: 2025-04-10 06:05:55 +0000 Commit: Colin Percival CommitDate: 2025-04-26 19:19: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 (cherry picked from commit 81ca663642ef1ed5111a88d2e9102f6788fab407) --- 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 7de07c6da714..61bd42f7bfa5 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -174,6 +174,7 @@ vm-image: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ + 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} \