Date: Wed, 1 May 2024 18:03:12 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f4b08097d8e2 - main - release: Stage non-UFS images in vm-images-stage Message-ID: <202405011803.441I3CW9013934@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f4b08097d8e274e1a8526d864c31462ea42d9e9f commit f4b08097d8e274e1a8526d864c31462ea42d9e9f Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2024-05-01 17:56:51 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-05-01 18:02:49 +0000 release: Stage non-UFS images in vm-images-stage When the VM image building code was updated to support building non-UFS images, the vm-images-stage target was not updated to install those newly built images to the FTP site. As a result, we have been sending weekly snapshot announcements since August claiming that ZFS VM images are available when they are not in fact present anywhere publicly accessible. Fixes: 32ae9a6b3937 "release: Build UFS and ZFS VM images" Reported by: Michael Dexter MFC after: 5 days --- release/Makefile.mirrors | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index cbc5cd768e28..591fd85b29ea 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -193,6 +193,16 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ ${OSRELEASE}.${VMFORMAT}.xz +. for FS in ${VMFSLIST} + cd ${RELEASEDIR}/vmimages && \ + mv ${OSRELEASE}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cd ${VM_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${OSRELEASE}-${FS}.${VMFORMAT}.xz +. endfor . endfor cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} @@ -212,6 +222,10 @@ vm-images-stage: . for VMFORMAT in ${VMFORMATS} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}.${VMFORMAT}.xz +. for FS in ${VMFSLIST} + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz +. endfor . endfor . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405011803.441I3CW9013934>