From a4d583fbeea789b027c9b2f9bb780f7a7f2e202b Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Tue, 22 Apr 2025 21:39:56 -0700 Subject: [PATCH] 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 (cherry picked from commit d14036ea424d5aa3eee20cc6f0b5d7117cc3931b) --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 61bd42f7bfa..6756d99bc28 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -124,6 +124,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ EC2BASEIMG=${.OBJDIR}/${EC2-BASE${_FS:tu}${_FMT:tu}IMAGE} \ + 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}} \