The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=59c529f2c856ec557954aa81b47603df8871ec25
commit 59c529f2c856ec557954aa81b47603df8871ec25
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2025-03-12 21:05:17 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2025-03-12 21:05:43 +0000
release/vm: force replacement of compressed images
Without this, rebuilding vm images will fail due to the .xz file
existing.
Reviewed by: emaste
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D49321
---
release/Makefile.vm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 0dc7bdbe1fe5..1f56bdb03f97 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -222,7 +222,7 @@ vm-install:
. for FORMAT in ${VMFORMATS}
. for FS in ${VMFSLIST}
# Don't keep the originals. There is a copy in ${.OBJDIR} if needed.
- ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT}
+ ${XZ_CMD} -f ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT}
. endfor
. endfor
. endif
@@ -238,7 +238,7 @@ cloud-install-BASIC-CI:
. for _FMT in ${BASIC-CI_FORMAT}
cp -p ${.OBJDIR}/${BASIC-CI${_FS:tu}${_FMT:tu}IMAGE} \
${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
- ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
+ ${XZ_CMD} -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
. endfor
.endfor
cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \
@@ -252,7 +252,7 @@ cloud-install-BASIC-CLOUDINIT:
. for _FMT in ${BASIC-CLOUDINIT_FORMAT}
cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \
${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT}
- ${XZ_CMD}
${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT}
+ ${XZ_CMD} -f
${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT}
. endfor
.endfor
cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
