From nobody Thu Apr 11 15:13:33 2024 X-Original-To: dev-commits-src-main@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 4VFjrY25mlz5HZT2; Thu, 11 Apr 2024 15:13:33 +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 4VFjrY1g1rz46Jp; Thu, 11 Apr 2024 15:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712848413; 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=UCEwEmSsXiwKfm8z7t0Cv+q2g0ePm61qrSUroC2eNvw=; b=j0yZKy6l1BjniI2HhufnCu43i8bqzszKWJfO8Eowyvt8aPr5/KnChRZbompun7ZA32AXRB xQdvtJTiF2H+jzv/0kMYIy9TofGFixDgXYhlv8VxPfQWTNOxdGI/OM+ZGLXC5H2KorIBvt T28TlrvpVI0K9CN1DZ51EoTMknABvYVQ5JAwcricGoiCwG7JuLWoWYLZUc7uQKgWsyBd7V 4Zw4uSAt488+FJk4dognxT2e4H9vYq9vht48OtGjQNvo3fkJ4tQFtLeflLKTUJExY1jE56 AM1AYf/ETxlaBsc2rbFvTzPZBtfUAioLJzBnfe8+KS4d3v4k2G8RKw7RpU8dqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712848413; a=rsa-sha256; cv=none; b=dMl/gz8i+2xFUe0GeKgB3ot6wawONVg6kZnueryqQ07TpjmfmTLrzvofSW3zzifZTTlwOk 0qd0phIfFfmridqWY92zLL0iHCpduFZkzsfaB66KN1+r/xOA1frzQsaJNGFceSnRnECS7T 1TMuXW0sY4xfcImLQAlbZas3K3q21Ei9KthjRiL7C+b4t9phVnW6qYylKWd7Trlmm6qX73 2CfOHdxdrOyDt6h4AxKAEhMdpZShe2EA8zsQOieL8dyZsfJjNNUdaPRtuAp8K9bcEimplU 7FrUMgqUvzKkGrW9xXIyFOUN95pflzyTCBpPWqrF1Ta+2eCbrTi/a0H/qDCUHg== 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=1712848413; 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=UCEwEmSsXiwKfm8z7t0Cv+q2g0ePm61qrSUroC2eNvw=; b=rBhqB9CfNG3tkSaA/gpa6dOHro6t9NR6cNkVDcxDYgWo8HRyFKyH0uUbhsqixHTfaJpgWi 9L/8oTKmw6grJjyuVfttkIoxQt0y5iwRfpv1bUF1CY2fthovL93im9dmyGgBxLmycFxgmy Z2W8jwMaNjSmanHQF39Nu81ZCHPdzVuwlmJyfela/vp4AQjttITlMIoN932zYHPeokC7C2 Y+dZ69BbrSt0COjAm0NvLY0fE1Gbn0Ls++gMnjdPM21A+1DLn+f+qZ1nfi6PuBaA2Okzrz ITxV8M2YfUGMgJIwq8PkuMgIBqu13lO555U5YnwPGjYENDY7amTNT5NO6R4WkQ== 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 4VFjrY0zHwz1QBD; Thu, 11 Apr 2024 15:13:33 +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 43BFDXxH032805; Thu, 11 Apr 2024 15:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BFDXDX032802; Thu, 11 Apr 2024 15:13:33 GMT (envelope-from git) Date: Thu, 11 Apr 2024 15:13:33 GMT Message-Id: <202404111513.43BFDXDX032802@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: eeec7a1199d0 - main - Revert "cloudware: allow disk format to be a list" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@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: eeec7a1199d0ce913b40fedb9d7e0d08d3f4f9c4 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=eeec7a1199d0ce913b40fedb9d7e0d08d3f4f9c4 commit eeec7a1199d0ce913b40fedb9d7e0d08d3f4f9c4 Author: Baptiste Daroussin AuthorDate: 2024-04-11 15:12:52 +0000 Commit: Baptiste Daroussin 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