svn commit: r366009 - stable/12/release/tools

[Colin Percival]

Author: cperciva
Date: Tue Sep 22 18:18:57 2020
New Revision: 366009
URL: https://svnweb.freebsd.org/changeset/base/366009

Log:
  Revert r361645.  The current quarterly ports branch contains ebsnvme-id,
  so packages are now available for all architectures.
  
  (Direct commit to stable/12 since r361645 never happened in HEAD.)

Modified:
  stable/12/release/tools/ec2.conf

Modified: stable/12/release/tools/ec2.conf
==============================================================================
--- stable/12/release/tools/ec2.conf	Tue Sep 22 17:30:53 2020	(r366008)
+++ stable/12/release/tools/ec2.conf	Tue Sep 22 18:18:57 2020	(r366009)
@@ -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.