mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-23 11:16:33 +00:00
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: 4771c2e9d1
"release: Publish non-uploaded cloudware bits"
MFC after: 6 days
This commit is contained in:
parent
f34aca55ad
commit
836f00ebb9
|
@ -209,10 +209,11 @@ vm-images-stage:
|
||||||
${OSRELEASE}-${FS}.${VMFORMAT}.xz
|
${OSRELEASE}-${FS}.${VMFORMAT}.xz
|
||||||
. endfor
|
. endfor
|
||||||
. endfor
|
. endfor
|
||||||
. for CW in ${CLOUDWARE}
|
. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
|
||||||
. if ${CW} == BASIC-CLOUDINIT
|
. for CW in ${CLOUDWARE}
|
||||||
. for VMFORMAT in ${${CW}_FORMAT}
|
. if ${CW} == BASIC-CLOUDINIT
|
||||||
. for FS in ${${CW}_FSLIST}
|
. for VMFORMAT in ${${CW}_FORMAT}
|
||||||
|
. for FS in ${${CW}_FSLIST}
|
||||||
cd ${RELEASEDIR}/vmimages && \
|
cd ${RELEASEDIR}/vmimages && \
|
||||||
mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
|
mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
|
||||||
${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
|
${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
|
||||||
|
@ -221,10 +222,11 @@ vm-images-stage:
|
||||||
cd ${VM_DIR}/Latest && \
|
cd ${VM_DIR}/Latest && \
|
||||||
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
|
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
|
||||||
${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
|
${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
|
||||||
|
. endfor
|
||||||
. endfor
|
. endfor
|
||||||
. endfor
|
. endif
|
||||||
. endif
|
. endfor
|
||||||
. endfor
|
. endif
|
||||||
cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.*
|
cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.*
|
||||||
. for CHECKSUM in ${CHECKSUM_FILES}
|
. for CHECKSUM in ${CHECKSUM_FILES}
|
||||||
cd ${RELEASEDIR}/vmimages && \
|
cd ${RELEASEDIR}/vmimages && \
|
||||||
|
@ -248,16 +250,18 @@ vm-images-stage:
|
||||||
${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz
|
${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz
|
||||||
. endfor
|
. endfor
|
||||||
. endfor
|
. endfor
|
||||||
. for CW in ${CLOUDWARE}
|
. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
|
||||||
. if ${CW} == BASIC-CLOUDINIT
|
. for CW in ${CLOUDWARE}
|
||||||
. for VMFORMAT in ${${CW}_FORMAT}
|
. if ${CW} == BASIC-CLOUDINIT
|
||||||
. for FS in ${${CW}_FSLIST}
|
. for VMFORMAT in ${${CW}_FORMAT}
|
||||||
|
. for FS in ${${CW}_FSLIST}
|
||||||
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
|
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
|
||||||
${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
|
${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
|
||||||
|
. endfor
|
||||||
. endfor
|
. endfor
|
||||||
. endfor
|
. endif
|
||||||
. endif
|
. endfor
|
||||||
. endfor
|
. endif
|
||||||
. for CHECKSUM in ${CHECKSUM_FILES}
|
. for CHECKSUM in ${CHECKSUM_FILES}
|
||||||
cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \
|
cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \
|
||||||
${VM_DIR}/Latest/CHECKSUM.${CHECKSUM}
|
${VM_DIR}/Latest/CHECKSUM.${CHECKSUM}
|
||||||
|
|
Loading…
Reference in a new issue