git: d14036ea424d - main - release: Pass PKG_INSTALL_EPOCH (take 2)

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Wed, 23 Apr 2025 04:43:57 UTC

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=d14036ea424d5aa3eee20cc6f0b5d7117cc3931b

commit d14036ea424d5aa3eee20cc6f0b5d7117cc3931b
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-04-23 04:39:56 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-04-23 04:41:39 +0000

    release: Pass PKG_INSTALL_EPOCH (take 2)
    
    We need to pass this to cloudware builds, not just VM builds.
    
    MFC after: 4 days
    Fixes:  81ca663642ef ("release: Pass PKG_INSTALL_EPOCH to vmimage.subr")
    Sponsored by:   Amazon
---
 release/Makefile.vm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 7821109cf9ca..ff8adcb8bd9b 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -138,6 +138,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT}
 		EC2BASEIMG=${.OBJDIR}/${EC2-BASE${_FS:tu}${_FMT:tu}IMAGE} \
 		${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} \
 		-F ${"${_CW:MEC2-BUILDER}" != "":?ufs:${_FS}} \