From nobody Fri Dec 15 18:10:56 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 4SsHMj1YXsz53t4r; Fri, 15 Dec 2023 18:10:57 +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 4SsHMj10Sbz3GWZ; Fri, 15 Dec 2023 18:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702663857; 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=BfChbn5n3iw0mm7vRdcv1q1rJtCLthD2dqPGVJSHmLU=; b=dCl1WAxAGNEniVhYPsolXx22qe8CixEirrlv1v6SDFES1Dej8/0xIm+6y15ZGPcwxIj54c n6jx8g3U0F5inEQW3X8seGi8W6TV/79wsh8vN5+TW3SuDeIzoFo7Z8XupzYKgvtAczVr3E ivFcrzx2YC1wdBzOISXWun8Ja5+3Gp3AErF/aefdDIfONT1+YeM00Cr+bQcPMvra8cWaKt /nzCkyL0F3uZHBsiYF0e2s2joMxE4AJNbH4nUnebYrcrT4tUW93aNTWQLW556rwIY7p4yi PHhw60bX4g/0IV8r/Jy0HIq7oEytc95vm5aB+8K5nnLaPvdzZ7mgWO66GCNQbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702663857; a=rsa-sha256; cv=none; b=DxlxARJj2ra/nHROllhU8C8Tu3xpy5pgqRXME1/zvnU7EB3Iu2QVn9irqn0aTpP1jIEY2P ika7QcPfITDceDuGHdYVbwJPnDH9+DrtIZM45H1oUkyUrwQNN8pznXzuGaJuDS92l8Bo0d KaG1TJ9by1F9a2i3ylgQS3B11SiXbgHOoSsKBUzznBQEGzpEoYuf7tArMFjE+KEoGtIffB EjCFiv6BfysSkOYVgvSNtiXfc5Vl08+j14v6gJ07sM6jRM4C/peyW+rCVYrlf3i+QKhZmI RWq9QWDPfDRG3QkzxtHqDEZNOrs7FLnkQIlz+mVKMOEAdL1AlgdmlBOVaTO9uQ== 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=1702663857; 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=BfChbn5n3iw0mm7vRdcv1q1rJtCLthD2dqPGVJSHmLU=; b=UyQGqnnE1ItUQF4j9POkOVOhwVzZ30ZRB9Mllwe/So8r+HtshtQH5xSBd1W44TcgVaJ4L8 WQgM6O9Om4ogzhz2KGSwuWvJIUiF0sSM4T1IWdAiqEMZxQqv0ypSqK/mToF/AjOH24H1aK GLf1ZwteMFdN7+jetp9AD3gyNyi3F5IfVPAgESL5vQW+GWzhcOay2xqU6znm1FCSPXm3aL IGpIeY1HAbJpmRSpIZNr/Ezp4cKvpbHqoyAdB6xcGzadbMHbrvqbQ2lLDoLCfb1DlCNo8h Scrr5Tf0sIFw/bmMv9RKO2JhcFwBuxI/gVr69L6yaPxG+v7LwFWKlw/22rZDZw== 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 4SsHMh740sz5dX; Fri, 15 Dec 2023 18:10:56 +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 3BFIAuDC043967; Fri, 15 Dec 2023 18:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFIAurY043964; Fri, 15 Dec 2023 18:10:56 GMT (envelope-from git) Date: Fri, 15 Dec 2023 18:10:56 GMT Message-Id: <202312151810.3BFIAurY043964@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: 863975b6840b - main - release/Makefile.vm: Add cloudware overrides 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: 863975b6840b2833b0f772648ba2532806ffece8 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=863975b6840b2833b0f772648ba2532806ffece8 commit 863975b6840b2833b0f772648ba2532806ffece8 Author: Brad Davis AuthorDate: 2023-12-15 18:08:50 +0000 Commit: Colin Percival CommitDate: 2023-12-15 18:08:50 +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. --- release/Makefile.vm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 58703de16cf3..cab46bb737b3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -23,28 +23,28 @@ CLOUDWARE_TYPES?= BASIC-CI \ 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 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