The branch main has been updated by bapt:
URL:
https://cgit.FreeBSD.org/src/commit/?id=eeec7a1199d0ce913b40fedb9d7e0d08d3f4f9c4
commit eeec7a1199d0ce913b40fedb9d7e0d08d3f4f9c4
Author: Baptiste Daroussin <b...@freebsd.org>
AuthorDate: 2024-04-11 15:12:52 +0000
Commit: Baptiste Daroussin <b...@freebsd.org>
CommitDate: 2024-04-11 15:13:29 +0000
Revert "cloudware: allow disk format to be a list"
This reverts commit 6ec9aaf63c81a68881cb6312f777349a0ac82ad5.
Requested by: cperciva
---
release/Makefile.vm | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index f403928ed78a..a52e3b9bac81 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -30,7 +30,7 @@ AZURE_DESC= Microsoft Azure platform image
BASIC-CI_FORMAT= raw
BASIC-CI_FSLIST?= ufs
BASIC-CI_DESC= Image for CI
-BASIC-CLOUDINIT_FORMAT= raw qcow2
+BASIC-CLOUDINIT_FORMAT= raw
BASIC-CLOUDINIT_FSLIST?= ufs zfs
BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support
EC2_FORMAT= raw
@@ -99,37 +99,33 @@ QEMUTGT?=
. if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf
. endif
-. for _FMT in ${${_CW:tu}_FORMAT}
-. for _FS in ${${_CW:tu}_FSLIST}
-CLOUDTARGETS+= cw-${_CW:tl}-${_FS}-${_FMT}
-CLEANDIRS+= cw-${_CW:tl}-${_FS}-${_FMT}
+. for _FS in ${${_CW:tu}_FSLIST}
+CLOUDTARGETS+= cw-${_CW:tl}-${_FS}
+CLEANDIRS+= cw-${_CW:tl}-${_FS}
CLEANFILES+= ${_CW:tl}.${_FS}.img \
- ${_CW:tl}.${_FS}.${_FMT} \
- ${_CW:tl}.${_FS}.${_FMT}.raw
-${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT}
+ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} \
+ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw
+${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}
-cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT}
+cw-${_CW:tl}-${_FS}: ${QEMUTGT}
mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
QEMUSTATIC=${QEMUSTATIC} \
${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F
${_FS} \
- -i ${.OBJDIR}/${_CW:tl}.${_FS}.img -s ${VMSIZE} -f ${_FMT} \
+ -i ${.OBJDIR}/${_CW:tl}.${_FS}.img -s ${VMSIZE} -f
${${_CW:tu}_FORMAT} \
-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}IMAGE} -c
${${_CW:tu}CONF}
touch ${.TARGET}
-. endfor
. endfor
# Hardlinks from "foo.bar" to "foo-${VMFS}.bar". These can go away once all
# of the cloudware code knows how to handle multiple filesystem images (or
# at least knows the name of the UFS image).
-. for _FMT in ${${_CW:tu}_FORMAT}
-CLOUDTARGETS+= cw-${_CW:tl}-${_FMT}
-CLEANFILES+= ${_CW:tl}.${_FMT}
-${_CW:tu}IMAGE= ${_CW:tl}.${${_FMT}
-cw-${_CW:tl}-${_FMT}: cw-${_CW:tl}-${VMFS}-${_FMT}
+CLOUDTARGETS+= cw-${_CW:tl}
+CLEANFILES+= ${_CW:tl}.${${_CW:tu}_FORMAT}
+${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT}
+cw-${_CW:tl}: cw-${_CW:tl}-${VMFS}
ln -f ${${_CW:tu}${VMFS:tu}IMAGE} ${${_CW:tu}IMAGE}
-. endfor
. endfor
.endif
