hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

release: Stop publishing non-FS-tagged VM images

Browse Source 
VM, BASIC-CI, and BASIC-CLOUDWARE images are published with the
filesystem type (UFS or ZFS) in the file name.  For backwards
compatibility we have published the UFS images with no filesystem
in the filename (aka with the same file names as we used before we
supported building ZFS VM images); those are going away now.

This will not be MFCed.
This commit is contained in:
Colin Percival 2024-06-21 14:39:44 -07:00
parent ac52fa1f1b
commit 45846afcb7
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
release/Makefile.mirrors
View File

@ -190,14 +190,6 @@ vm-images-stage:
mkdir -p ${VM_DIR}/Latest
mkdir -p ${VM_DIR}/${BUILDDATE}
. for VMFORMAT in ${VMFORMATS}
cd ${RELEASEDIR}/vmimages && \
mv ${OSRELEASE}.${VMFORMAT}.xz \
${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz
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 \
@ -243,8 +235,6 @@ vm-images-stage:
. endif
mkdir -p ${VM_DIR}/Latest
. 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
@ -289,14 +279,6 @@ ci-images-stage:
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
. endfor
cd ${RELEASEDIR}/ciimages && \
mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz
cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz
cd ${CI_DIR}/Latest && \
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}.${VMFORMAT}.xz
. endfor
. endif
. endfor
@ -322,8 +304,6 @@ ci-images-stage:
cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \
${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
. endfor
cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \
${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz
. endfor
. endif
. endfor

12
release/Makefile.vm
View File

@ -209,14 +209,6 @@ vm-install:
. endfor
. endfor
. endif
# Compatibility hardlinks from "foo.bar" to "foo-${VMFS}.bar".
. for FORMAT in ${VMFORMATS}
. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT}.xz ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}.xz
. else
ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
. endif
. endfor
cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
${DESTDIR}/vmimages/CHECKSUM.SHA512
cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
@ -231,10 +223,6 @@ cloud-install-BASIC-CI:
${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
. endfor
.endfor
.for _FMT in ${BASIC-CI_FORMAT}
ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \
${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz
.endfor
cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \
${DESTDIR}/ciimages/CHECKSUM.SHA512