svn commit: r366212 - releng/12.2/release/tools

[Colin Percival]

Author: cperciva
Date: Mon Sep 28 00:52:16 2020
New Revision: 366212
URL: https://svnweb.freebsd.org/changeset/base/366212

Log:
  MFS r366009: Include ebsnvme-id in arm64 AMIs.
  
  Approved by:	re (delphij)
  Sponsored by:	https://www.patreon.com/cperciva

Modified:
  releng/12.2/release/tools/ec2.conf
Directory Properties:
  releng/12.2/   (props changed)

Modified: releng/12.2/release/tools/ec2.conf
==============================================================================
--- releng/12.2/release/tools/ec2.conf	Mon Sep 28 00:23:59 2020	(r366211)
+++ releng/12.2/release/tools/ec2.conf	Mon Sep 28 00:52:16 2020	(r366212)
@@ -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.