From nobody Wed Sep 11 05:29:30 2024 X-Original-To: dev-commits-src-branches@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 4X3Tf26qHXz5WD9t; Wed, 11 Sep 2024 05:29:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Tf25Jyrz4mdg; Wed, 11 Sep 2024 05:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726032570; 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=t79iO3a8dbNFt8RG4Km6ve2favJ59WxvdJhc9IeqsRc=; b=uRDHNq/ZF6V7Fmj3xBq+RGEe+ijKdRxsFIsyitK48mq/blYeUlPQZVpH9yhHoqhNaqEnLQ YYmaa9cNHc/Dr6LoT//oiO+spVw37TP5EvsGPHFOVdztPaIGr349C3W2pR4GBl4ivIw710 rutH6KvNNTsAJQ4Y5N5R5WRguMmV3NYHxVGM0wP0rc/an5w7h1mWpYGBv2JJQIvyDp/6ZZ IF1SxbRf9PkBx0whfi/PlARIXfmGsdQBMH+oO4iTCyGi4JGc2EDZ/I1wolsCI8NtLw8n1T u4k3jhhoBXltvLQC1iu4aPEw7tlUtJlEE4bHVJJb/kuh0UqAvbgTAnK/hoWlCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726032570; a=rsa-sha256; cv=none; b=ljwEFrpbyLPjleSfjYEJ7pjgzDo+qaDNE1BsKKXgzdaQiCBWWd0DcX0zUBD9i3qxqYhjDn 7xb0qFA03d8sZJ2FxsMRDNsSB7OpQgOMF96rG4gc+A3CMjqB1QFLe0UWWTN9Uys3A2iMVB ac9AQ6cSYJLAKOEgbGscv4xnkqZ9Gu3IyaR7imHXUgg0YXDKDWGl//5C3u6RW7Vi1DCx46 rAh4ETO4pTD9mxA0v40I2relrSxqM/bj2Dqe3sERg9UwbcSRLkEfCFd7aF0jFQZtjDg/77 7C6GwnpshJJfXVyXa2ox4SB2tXhfVbvH3Ykv0R6POns5/qN3dDZDEquyqRAq4A== 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=1726032570; 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=t79iO3a8dbNFt8RG4Km6ve2favJ59WxvdJhc9IeqsRc=; b=DGXFb97l1XpO++yCllf7ymVkmF2hEdAEDD9rCgQTICIhzmE7AQZGNWzTCHZbFFkoKBWvjf mYTVCsB8ETfNv5XC3rRQ05ronM4ulIHvgHTcp7BFbTFRRpDoyGQU8OLkkEceU2Ygv6Okhb BUaETb0/tHgk6pZ5+nLAH31n2xoJyQIUUX2+HOJCY8sWTpG7JROmspP/2tEms+hhK1FZ5j ERjHIuNN1ufl2MpnIhAxZUBRVYfNtJiImlZG5KSG627rX5wP8JwfM7KjtKeWYAL4LbmD0v CxZf1E3gcq1WAKja/JVnNG0vsOSAehWQlA5OHwPuWmUc6TlHWdkdRCCf76hUxA== 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 4X3Tf24wR4zHZJ; Wed, 11 Sep 2024 05:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48B5TUdb065044; Wed, 11 Sep 2024 05:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B5TUmi065041; Wed, 11 Sep 2024 05:29:30 GMT (envelope-from git) Date: Wed, 11 Sep 2024 05:29:30 GMT Message-Id: <202409110529.48B5TUmi065041@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: d263bfda8203 - stable/14 - release/Makefile.vm: Add cloudware overrides List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: d263bfda82036aa6ac153479e2a13a119a498fcf Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d263bfda82036aa6ac153479e2a13a119a498fcf commit d263bfda82036aa6ac153479e2a13a119a498fcf Author: Brad Davis AuthorDate: 2023-12-15 18:08:50 +0000 Commit: Colin Percival CommitDate: 2024-09-11 05:28:59 +0000 release/Makefile.vm: Add cloudware overrides Allow the cloudware *_FLAVOURS and *_FSLIST values to be overridden at the command line, to assist users who want to e.g. build only one of the many EC2 AMIs available. (cherry picked from commit 863975b6840b2833b0f772648ba2532806ffece8) --- release/Makefile.vm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 71a4392b6b0c..8c48c0a13dc9 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -25,31 +25,31 @@ CLOUDWARE_TYPES?= AZURE \ OCI \ VAGRANT AZURE_FORMAT= vhdf -AZURE_FSLIST= ufs zfs +AZURE_FSLIST?= ufs zfs AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw -BASIC-CI_FSLIST= ufs +BASIC-CI_FSLIST?= ufs BASIC-CI_DESC= Image for CI BASIC-CLOUDINIT_FORMAT= raw qcow2 BASIC-CLOUDINIT_FSLIST?= ufs zfs BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support EC2_FORMAT= raw -EC2_FSLIST= ufs zfs -EC2_FLAVOURS= BASE CLOUD-INIT +EC2_FSLIST?= ufs zfs +EC2_FLAVOURS?= BASE CLOUD-INIT EC2-BASE_DESC= Amazon EC2 image EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image GCE_FORMAT= raw -GCE_FSLIST= ufs zfs +GCE_FSLIST?= ufs zfs GCE_DESC= Google Compute Engine image OCI_FORMAT= qcow2 -OCI_FSLIST= ufs +OCI_FSLIST?= ufs OCI_DESC= Oracle Cloud Infrastructure image OPENSTACK_FORMAT=qcow2 -OPENSTACK_FSLIST= ufs +OPENSTACK_FSLIST?= ufs OPENSTACK_DESC= OpenStack platform image VAGRANT_FORMAT= vmdk -VAGRANT_FSLIST= ufs -VAGRANT_FLAVOURS= VIRTUALBOX VMWARE +VAGRANT_FSLIST?= ufs +VAGRANT_FLAVOURS?= VIRTUALBOX VMWARE VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox VAGRANT-VMWARE_DESC= Vagrant Image for VMWare