From nobody Thu Apr 11 14:08:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VFhNy2J7Qz5HTT7; Thu, 11 Apr 2024 14:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFhNy1kW2z41Hj; Thu, 11 Apr 2024 14:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712844482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOU1kdaA3x8urEMcCTzQ/zFwajhREV1IvwE3+fSBZM4=; b=q4zXJul0sDcfg73th3XdrpLXKQBBW00wZFx3DCDOEhQmfwD8HgGInTMRGoYX5ZDO8JJ9sV 4A2JHCPm6O9+tPlugbJsfZDz61QewxrV5bGCcxK0aW4Cm35HMF40QzZtXyMuj1P4cto2Cq zsmMxaD0ywuLEuAHFoSEmMehZ0pCjCbpbfbD8JCYqxCFBMNd9VErCup0KD6imbwFHoYAcW 8ggMHDw+/qiutJOioKsmVzxis2mTIg94uRcCiVVNQdANo0wl2CJILHQPw+zdJRNwLu2y8O 5NMqgNr1uJYaKtieLFX6cSeE3T1roNmkkgODS/yUMN1DkgjXhFQHp6B+k+IO1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712844482; a=rsa-sha256; cv=none; b=vd4gwRw/u0Kgm9JY+9QJOtugNl0TqPFidjSbpJMjYmE+61GROzfVtgBfn4kdPrt+Gii57Z 2Qf/aCg9hXxVqcVhRoMzchKnZdchAF/EXma/vDERoEDuwp2+/hGMnouJ0jzGaqLZQKT2oV iG/49ptehiQJKYJZQhUpsr0H0fucjImUY/dMtIH558rJ3P5WS76TLBXXHBpgHQ4hWC16cg OcJQR0wsv9UoIKXqyR6trO5Sr6IxvMztnF8Y9BztHUCWkFeDXyUku0vAVglSvUUHIIuATV ACIiG9IIZ9rjBndf/3e1bVLEyZ5SvCARcyO15uwQRmW+SqvjdHXbr+dc14fw3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712844482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOU1kdaA3x8urEMcCTzQ/zFwajhREV1IvwE3+fSBZM4=; b=dPJ+/1PjBw/j/Iag6T3wa8Sgot+l4y36xbtkZP0rbWpLn3BDosgcURfF69jVhbC4alpJEP yuBgQsmj5XIQL18SUI6YGCfCo6cygqSkQuGtywHxPw9bBTKcfkTZtsTo3WEAFlqYk/xUnJ h4Yf/tUxSgqnAFPiTEVZ4wF6OCo9pHhvH0jdnmJ1GYFOKLWb38U4eb0CN5nZ54RZE7913n HX0nbSLu+Lfs9rbghJbHyjM0bAMX75RLPs5djuc6TaePR5E+/s1P2JxAySF8yT5klEFwj+ 7n4H8ERBmEvxIXiDpW1cywvHbI/nfyGSUPtUC0jrTJFycvL6Sa5fNfVCKhkNIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFhNy1Ktcz1NkS; Thu, 11 Apr 2024 14:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BE82d9015262; Thu, 11 Apr 2024 14:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BE82hj015259; Thu, 11 Apr 2024 14:08:02 GMT (envelope-from git) Date: Thu, 11 Apr 2024 14:08:02 GMT Message-Id: <202404111408.43BE82hj015259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 6ec9aaf63c81 - main - cloudware: allow disk format to be a list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ec9aaf63c81a68881cb6312f777349a0ac82ad5 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec9aaf63c81a68881cb6312f777349a0ac82ad5 commit 6ec9aaf63c81a68881cb6312f777349a0ac82ad5 Author: Baptiste Daroussin AuthorDate: 2024-04-11 07:33:49 +0000 Commit: Baptiste Daroussin CommitDate: 2024-04-11 14:07:50 +0000 cloudware: allow disk format to be a list Make basic-cloudinit available both in qcow2 and raw formats MFC After: 1 week Reviewed by: Allanjude Sponsored by: OVHCloud Differential Revision: https://reviews.freebsd.org/D44747 --- release/Makefile.vm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a52e3b9bac81..f403928ed78a 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 +BASIC-CLOUDINIT_FORMAT= raw qcow2 BASIC-CLOUDINIT_FSLIST?= ufs zfs BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support EC2_FORMAT= raw @@ -99,33 +99,37 @@ QEMUTGT?= . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif -. for _FS in ${${_CW:tu}_FSLIST} -CLOUDTARGETS+= cw-${_CW:tl}-${_FS} -CLEANDIRS+= cw-${_CW:tl}-${_FS} +. for _FMT in ${${_CW:tu}_FORMAT} +. for _FS in ${${_CW:tu}_FSLIST} +CLOUDTARGETS+= cw-${_CW:tl}-${_FS}-${_FMT} +CLEANDIRS+= cw-${_CW:tl}-${_FS}-${_FMT} CLEANFILES+= ${_CW:tl}.${_FS}.img \ - ${_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:tl}.${_FS}.${_FMT} \ + ${_CW:tl}.${_FS}.${_FMT}.raw +${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT} -cw-${_CW:tl}-${_FS}: ${QEMUTGT} +cw-${_CW:tl}-${_FS}-${_FMT}: ${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 ${${_CW:tu}_FORMAT} \ + -i ${.OBJDIR}/${_CW:tl}.${_FS}.img -s ${VMSIZE} -f ${_FMT} \ -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). -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} +. 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} ln -f ${${_CW:tu}${VMFS:tu}IMAGE} ${${_CW:tu}IMAGE} +. endfor . endfor .endif