diff options
| author | Brad Davis <brd@FreeBSD.org> | 2021-08-09 16:31:51 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2023-07-05 21:00:20 +0000 |
| commit | 6dd5f023132433801caf18db85f1b9f0f9bb9a7b (patch) | |
| tree | f04cf8080b89a1a4c99b641eefadd29ff49f9866 | |
| parent | 2d148ce84d29321f5f1a0ccb405c5238f5859005 (diff) | |
| download | src-6dd5f023132433801caf18db85f1b9f0f9bb9a7b.tar.gz src-6dd5f023132433801caf18db85f1b9f0f9bb9a7b.zip | |
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
(cherry picked from commit 83952a5baa337cc257858feb4886d947ba1a60e3)
| -rw-r--r-- | release/tools/azure.conf | 2 | ||||
| -rw-r--r-- | release/tools/ec2.conf | 4 | ||||
| -rw-r--r-- | release/tools/gce.conf | 7 | ||||
| -rw-r--r-- | 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 1f3b581a4f27..f1513926e681 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 30561acb054c..593dc398b219 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 c683cf7a07d2..3a4bc1896408 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" |