diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2024-05-01 17:56:51 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2024-05-01 18:02:49 +0000 |
| commit | f4b08097d8e274e1a8526d864c31462ea42d9e9f (patch) | |
| tree | ea9dab98e94d0ad1d1ea825b1490a28ff9e6a253 | |
| parent | 793556efded5cd3ba3b254d6b045bf6c1aab1f86 (diff) | |
| download | src-f4b08097d8e274e1a8526d864c31462ea42d9e9f.tar.gz src-f4b08097d8e274e1a8526d864c31462ea42d9e9f.zip | |
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
| -rw-r--r-- | release/Makefile.mirrors | 14 |
1 files changed, 14 insertions, 0 deletions
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} \ |