From nobody Thu Sep 28 22:18:51 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 4RxSYl4w6Qz4vgqF; Thu, 28 Sep 2023 22:18:51 +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 4RxSYl43Mnz3NGF; Thu, 28 Sep 2023 22:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695939531; 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=5M2TLD7ZtNFFyip88kuTivhkNK5IvkkE1Ddb9dj+Bh4=; b=ZnRByh21DI+510DZ45+YAz1wJBOcR9iX6I8NMDXVd3lXwUkDoQo+mH5wVbu4SG0sZH2ENp WbzJbnzOFsY2yjZCmDDCe9iFLLo+dhHfZ9tkioL7EGzpu/4qZwK5mnOC/E+XVUSSRbSoe/ rDYPwwvBEBylnFcKtNPO3RIBBttRwhPni8GemiV5CO+anR6vr2f7DLnDnhaZVITvDahI8D Nswr7rzQDnaeFE43ezPhG7Dgr0NVEhq6YheVOJBmkjdq4eQV/+EzJAfMs1vfOFyR8u2WXt XPT/DW+8JlNpTjl0jPZFoOP59F6ozNNqVIQYdLxY/HmmC2O8mQaCG+zYoSNZGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695939531; a=rsa-sha256; cv=none; b=nymI0X56QS6oi3xr/wU8shwHGrq50fU0BE1eEG16DmtjFGrnG2/Q2SNfQgs6xZJemCsGJP jPgo1M6Lbvmj3hiJ5uJcwicgZI3GqBGa7gZyGetE8MgbL0PiV9VvZb4AqBo7HN2JZyJ8NN QzhqyKPgMjT3pqc/8FY0CBk8oiYv/5D5/UyQbz4PGau7WR7CxfdVkfEl2InZbNf4YC6u9V 2Wd1qNQFfSkAty/2R6g9rBOyR4JKI9DNtXvgan4TMXvS3IUvaf2zIOPgukrSiJF+GFzEJx FejPjyBNQlriaMC+xv0Q/wIjzJUfPFVxg5OzvOj0lW67oFjie+24kdEaVtTiKA== 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=1695939531; 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=5M2TLD7ZtNFFyip88kuTivhkNK5IvkkE1Ddb9dj+Bh4=; b=MKAOjEUO47HO7i7VbeMNlpzQzOFNsq7wZnFnXHv3VIb/6g65xBeQdblYKUt8fgCP3cIvrz MVkLxw7tt7vkW2Nh/7KmqcnytUZ82aku5fh8GN8CEUYnfHMxDrliqClymS5VzfVsMQm6UY apudoQqhw6SMIaa722QOiG9RkuXPDP5M4ypEAn1AbDS1IwedVo7pzpHqHrITj5dtUVQYpP ynNSbNZNU1r+p+ziPC1p5l69ZSGKOR6FIT8KdDF2qNBpRYlVYwE528O5kI/XseDeyZTwiC Pxcr/6SlhsoGWoiR3+g5/POVoTcDCSpOYdKNfhjHxeZPsyOPT0oO44MPaeLBkA== 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 4RxSYl305dzfwG; Thu, 28 Sep 2023 22:18:51 +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 38SMIpRl056803; Thu, 28 Sep 2023 22:18:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SMIp8H056800; Thu, 28 Sep 2023 22:18:51 GMT (envelope-from git) Date: Thu, 28 Sep 2023 22:18:51 GMT Message-Id: <202309282218.38SMIp8H056800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e6eeac9b7179 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e6eeac9b71795252b12a6b94e7a06633a9ff6e4e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e6eeac9b71795252b12a6b94e7a06633a9ff6e4e commit e6eeac9b71795252b12a6b94e7a06633a9ff6e4e Author: Colin Percival AuthorDate: 2023-09-09 00:51:08 +0000 Commit: Colin Percival CommitDate: 2023-09-28 22:18:46 +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. releng/14.0 candidate. Discussed with: gjb Reviewed by: imp MFC after: 5 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41790 --- release/Makefile.vm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index befa9625fefb..bb719da68ead 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 zfs 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}