Date: Wed, 26 Jun 2024 00:35:18 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 443a4ce9d401 - stable/14 - release: Don't publish CW if !WITH_CLOUDWARE Message-ID: <202406260035.45Q0ZIHN030713@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=443a4ce9d401db290a552558787765e413b34484 commit 443a4ce9d401db290a552558787765e413b34484 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2024-06-21 00:38:46 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-06-26 00:34:43 +0000 release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days (cherry picked from commit 836f00ebb96ac343e0f8a68ea264d2d330198488) --- release/Makefile.mirrors | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index fd233e7abdb6..1888f86d3002 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -209,10 +209,11 @@ vm-images-stage: ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/vmimages && \ mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz @@ -221,10 +222,11 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/vmimages && \ @@ -248,16 +250,18 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406260035.45Q0ZIHN030713>