aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2020-09-28 00:52:16 +0000
committerColin Percival <cperciva@FreeBSD.org>2020-09-28 00:52:16 +0000
commitc18eb742b0083583b0d9aabded1b3fe8d307f459 (patch)
tree9661faccf6e3148a602008de1f483529b084caa9
parentdf309babcf29db1895ec5fe6bc7f5289231a3b31 (diff)
downloadsrc-c18eb742b0083583b0d9aabded1b3fe8d307f459.tar.gz
src-c18eb742b0083583b0d9aabded1b3fe8d307f459.zip
MFS r366009: Include ebsnvme-id in arm64 AMIs.
Approved by: re (delphij) Sponsored by: https://www.patreon.com/cperciva
Notes
Notes: svn path=/releng/12.2/; revision=366212
-rw-r--r--release/tools/ec2.conf9
1 files changed, 1 insertions, 8 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 88d299902186..440c69cc95ff 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -6,14 +6,7 @@
# 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 dual-dhclient-daemon"
-
-# This package isn't currently (2020-05-29) available for aarch64 since it is
-# not yet in the "quarterly" branch. Some time after 2020-07-01 this can be
-# made unconditional.
-if [ "${TARGET_ARCH}" = "amd64" ]; then
- export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id"
-fi
+export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs dual-dhclient-daemon 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.