From owner-dev-commits-src-all@freebsd.org Mon Aug 9 16:37:19 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2905F6578E9; Mon, 9 Aug 2021 16:37:19 +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 4Gk1vg0ZkNz4qJy; Mon, 9 Aug 2021 16:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EBFBA2EE7; Mon, 9 Aug 2021 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 179GbIPv008677; Mon, 9 Aug 2021 16:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 179GbIJP008676; Mon, 9 Aug 2021 16:37:18 GMT (envelope-from git) Date: Mon, 9 Aug 2021 16:37:18 GMT Message-Id: <202108091637.179GbIJP008676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 83952a5baa33 - main - release: allow VM_EXTRA_PACKAGES to be specified in the environment MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83952a5baa337cc257858feb4886d947ba1a60e3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2021 16:37:19 -0000 The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=83952a5baa337cc257858feb4886d947ba1a60e3 commit 83952a5baa337cc257858feb4886d947ba1a60e3 Author: Brad Davis AuthorDate: 2021-08-09 16:31:51 +0000 Commit: Brad Davis CommitDate: 2021-08-09 16:31:51 +0000 release: allow VM_EXTRA_PACKAGES to be specified in the environment This is useful for adding extra packages to the build of an AMI. For example: env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami Approved by: gjb MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- release/tools/azure.conf | 2 +- release/tools/ec2.conf | 4 +++- release/tools/gce.conf | 7 ++++--- release/tools/vagrant.conf | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 60076984b1bd..c88651a07745 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,7 +6,7 @@ # Set to a list of packages to install. # Example: #export VM_EXTRA_PACKAGES="www/apache24" -export VM_EXTRA_PACKAGES="sysutils/azure-agent" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} sysutils/azure-agent" # Set to a list of third-party software to enable in rc.conf(5). # Example: diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 888a446659a5..2bf47b01077d 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -6,7 +6,9 @@ # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap further # package installation as specified via EC2 user-data. -export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client ebsnvme-id" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ + firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client \ + ebsnvme-id" # Include the amazon-ssm-agent package in amd64 images, since some users want # to be able to use it on systems which are not connected to the Internet. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 113784a7643e..745477f0bc8e 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -7,9 +7,10 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ - google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ - lang/python lang/python2 lang/python3" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ + firstboot-pkgs \ google-cloud-sdk panicmail sudo \ + sysutils/py-google-compute-engine lang/python lang/python2 \ + lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 05e7052d46c4..ebf69338b7d7 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -8,7 +8,8 @@ export VMSIZE=8g # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap. -export VM_EXTRA_PACKAGES="shells/bash firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \ + firstboot-freebsd-update firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs"