From nobody Thu Oct 5 15:54:33 2023 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 4S1bj54TRXz4vs6L; Thu, 5 Oct 2023 15:54: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 4S1bj542nJz3LfK; Thu, 5 Oct 2023 15:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521273; 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=VdyopBprf7E8Q/QO/yIjiRWJo8ddrCjPlKz4jT7Uhg4=; b=p2sl29GMNTn0lMrot9M/kZHyUcu1bxvWa1TV7hHfcevNJ5uFSZ5b1k1VegZ0jfseMeKhm9 gxt5ygCiDU3bVKa8M+Q78hT7nk1nXI1BR+tXpS6zbqD+aMGVcfpAqDASfg8UQd9O7FyKjv VWRT+GqKe+mwsiNfWFeI6Wg5KI+DUKB47Qku4x168mvr0uJJYr/KC2dcQhOVA7qUeslQgq bok81nNZOdRnLez9/cQt0Zvb5H+lfoZHb635txDMSoSfu2y/oLGprYVRpv6DnNMrA3zR88 8e3pYMe1oE793+5cWPgtZ892F/YwxEgyLvtzuD2KErmiieL1UkPV37a918KCfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696521273; a=rsa-sha256; cv=none; b=xIrW4F+jnGX+U+hibP3NSodi0Gw87TMPdPxErCDzx0KSFlRTESCWGV2cBPgdSPRbzEmGNu FoQMUgiwandN0Qrp4gnc2BAVaxT2Ilg5tyYqsoi5b/ypLlbEtOhpUWL+3iS4y9dixeFH3o 2n8jOaibgFXr89kqN+eACClAWNvtzHZrBZK2qYO5JiaiDJTUGJga29mc0F7g3inSqBHn8M 2gHW22otGvnEZ8RE5oeESXXH/QtIJC3yVYmbx00UH6EPnjrM69Z/D0HIJJivmnrpSgIl+6 cf1s8ghDV6h/Y9Rz8teA/rtdG6Zj2rnd5RGmiaVvN3TFqFpYWqkVDymqUv1pbw== 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=1696521273; 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=VdyopBprf7E8Q/QO/yIjiRWJo8ddrCjPlKz4jT7Uhg4=; b=UlJOVReoGG87J2w2z9fAzlBdG5FFMx8xhIcqS2oGiLHELgbGiBXu7H4/BX6thHqvFBEwxl ESGA/vbt2yka0qLOG8+X3eUmy+9it5Hgea5Snk7mD28pp9jsRfpY8e8HWUA5mQ+ngtuB4T MPeYsttIJKWQgmJeW574V2f8i/rJ2UN8VXpUXNkUupJ7M8vI4dbeEv9q6+SBTb3QggnrDm AwGfnBApJr1nrlRKXMap1gEgeF2nbVO9FPEIogdHPzfDRuNQXtpzCDaERMiwbVI77XizHP xa6n1CixPzQX9CC09pPvJqMqAeXX9MPpAK3RA9gN76OCiuNC5sxYGjWb6xYG0w== 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 4S1bj534ZFz1QPG; Thu, 5 Oct 2023 15:54: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 395FsXA4046662; Thu, 5 Oct 2023 15:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FsX4G046659; Thu, 5 Oct 2023 15:54:33 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:54:33 GMT Message-Id: <202310051554.395FsX4G046659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d371e6ef0624 - releng/14.0 - release/Makefile.vm: Add support for CW flavours 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: owner-dev-commits-src-all@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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d371e6ef06242dcb63219d6163d279c7cff847bc Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d371e6ef06242dcb63219d6163d279c7cff847bc commit d371e6ef06242dcb63219d6163d279c7cff847bc Author: Colin Percival AuthorDate: 2023-09-09 00:51:08 +0000 Commit: Colin Percival CommitDate: 2023-10-05 15:54:03 +0000 release/Makefile.vm: Add support for CW flavours There are two "Vagrant" images right now: "Vagrant Image for VirtualBox" and "Vagrant Image for VMWare". Rather than listing these separately in a CLOUDWARE list, place "VAGRANT" into a CLOUDWARE_TYPES list and then use a VAGRANT_FLAVOURS variable to identify the two versions. Add make logic to allow defaults (in this case, image format and filesystem) to be specified once for VAGRANT and inherited by both flavours. This will make future work to add flavoured EC2 images simpler. Approved by: re (gjb) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41790 (cherry picked from commit e6eeac9b71795252b12a6b94e7a06633a9ff6e4e) (cherry picked from commit fec4f6a7c377f576c78dabe16bc632ecf20058b4) --- release/Makefile.vm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 4041ae14e2f3..e7ff86c28df3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -17,12 +17,11 @@ VMDK_DESC= VMWare, VirtualBox disk image QCOW2_DESC= Qemu, KVM disk image RAW_DESC= Unformatted raw disk image -CLOUDWARE?= BASIC-CI \ +CLOUDWARE_TYPES?= BASIC-CI \ EC2 \ GCE \ OCI \ - VAGRANT-VIRTUALBOX \ - VAGRANT-VMWARE + VAGRANT AZURE_FORMAT= vhdf AZURE_FSLIST= ufs AZURE_DESC= Microsoft Azure platform image @@ -41,13 +40,26 @@ OCI_DESC= Oracle Cloud Infrastructure image OPENSTACK_FORMAT=qcow2 OPENSTACK_FSLIST= ufs OPENSTACK_DESC= OpenStack platform image -VAGRANT-VIRTUALBOX_FORMAT= vmdk -VAGRANT-VIRTUALBOX_FSLIST= ufs +VAGRANT_FORMAT= vmdk +VAGRANT_FSLIST= ufs +VAGRANT_FLAVOURS= VIRTUALBOX VMWARE VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox -VAGRANT-VMWARE_FORMAT= vmdk -VAGRANT-VMWARE_FSLIST= ufs VAGRANT-VMWARE_DESC= Vagrant Image for VMWare +.for _CWT in ${CLOUDWARE_TYPES} +. if defined(${_CWT}_FLAVOURS) +. for _CWF in ${${_CWT}_FLAVOURS} +CLOUDWARE_GEN+= ${_CWT}-${_CWF} +${_CWT}-${_CWF}_FORMAT?= ${${_CWT}_FORMAT} +${_CWT}-${_CWF}_FSLIST?= ${${_CWT}_FSLIST} +${_CWT}-${_CWF}_DESC?= ${${_CWT}_DESC} +. endfor +. else +CLOUDWARE_GEN+= ${_CWT} +. endif +.endfor +CLOUDWARE?= ${CLOUDWARE_GEN} + .for _V in TYPE BRANCH REVISION . if !defined(${_V}) || empty(${_V}) ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}