From nobody Tue Oct 03 17:28:40 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 4S0Ptc2l0xz4vmH5; Tue, 3 Oct 2023 17:28:40 +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 4S0Ptc2GJCz4Kfx; Tue, 3 Oct 2023 17:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354120; 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=ajair3VlsEsK4LPGwNW12Vp2rVZOFHkgKJVbeKSAzUw=; b=TDGgniYXtCzl82adkwjO74Cdj8Fubflm+viLJuveNAVSskbbfZ6ekQHb7w2BONbJWffO86 baGGfEPfByNOQ3J2hMxBKBGVBbTDfNWPzMBnaeTUnEqtQifvu8kMaxZ67xBEYzxpaQ9oyZ /E6mvjzFXayOEQhQo2JewskfmiNftz5NOM3u4Hqhjx+7BQUS3mfWhRNBAlxY2okD5cMQ8R tvjtw3etm8XhFpTFB4dKBYyruUyjKj5fuITqTLDrAt2QZaalCAkY5f2Gm0LWTCwEBDW6m+ ZRFgxpunoJ7t+HEzfh5yhV77xBN0AY1125O0xPsLSkl/HAYrdhFS5UY2dJsYuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696354120; a=rsa-sha256; cv=none; b=SW3m55Rs5soAsDk4Y+PDtGI9lFchUknl1sBvwOnOSzQ7ZkLQ9eNusUPkejBaz5mFVOoTsS lPGCuJ+UYlha/ohHrwdLmuqzEJhiMMXeA6qe12VYCV1pIGjSLTYI91UK0yH5lhr9qlaUH0 NeuNnDFbxkHPXmMA+6dw5BxrrxLAGkyzL9vo8hW0I4bQzKh2qd33D5GywFU4oImbA9viqP ++EAmuApdvUfZCRdvgje8IztJ84Qk01X2foyCNWD9ebrwlwYdj2pzexEsFpG7A/cXIIqnt XRbGNf28V+MlgA5yVLrN70iewz9ewefOj6I9XCDOOqRPy/n0iZgcQSn8kzFQ2g== 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=1696354120; 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=ajair3VlsEsK4LPGwNW12Vp2rVZOFHkgKJVbeKSAzUw=; b=HhAImxyiljQgT0+OruWYcKZPWU20zKWPgZoIiJof4l41H/nGJfSwVW7PyEdNKxsmNRQLI1 WEhuhHeANtVw+9Sz45A72H2sAolzUIt6JuKMZBZNk5SIhUACUxtLwO52mLEjt2nZFCFrpS TvBn4P7BRCjKM6aJ+wOaUCzDE7A+xBEeJVYpO33/abKxuNZlGKii+K3f8kBWuZ/7SzM5mk Ze0M+L+0fNTMSCZJQ1MY/PKcOkF31oTytHbNsQsct1g9dWZg13prGv/yT1dEmclHUhyUvn Rpp7Rwc2K1uFZ3noaKAiB3i1nJtdsZLGcnOpDsXuLRJG+0GX2mFccP9tKVToAw== 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 4S0Ptc0jhRz13q1; Tue, 3 Oct 2023 17:28:40 +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 393HSeYl085530; Tue, 3 Oct 2023 17:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393HSebx085527; Tue, 3 Oct 2023 17:28:40 GMT (envelope-from git) Date: Tue, 3 Oct 2023 17:28:40 GMT Message-Id: <202310031728.393HSebx085527@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: fec4f6a7c377 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fec4f6a7c377f576c78dabe16bc632ecf20058b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fec4f6a7c377f576c78dabe16bc632ecf20058b4 commit fec4f6a7c377f576c78dabe16bc632ecf20058b4 Author: Colin Percival AuthorDate: 2023-09-09 00:51:08 +0000 Commit: Colin Percival CommitDate: 2023-10-03 17:28:17 +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 (cherry picked from commit e6eeac9b71795252b12a6b94e7a06633a9ff6e4e) --- 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}