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

[Colin Percival]

Author: cperciva
Date: Sat May 30 02:56:13 2020
New Revision: 361645
URL: https://svnweb.freebsd.org/changeset/base/361645

Log:
  Direct commit to stable/12: Only install ebsnvme-id on amd64 for now.
  
  This port is in the "latest" ports tree but not in "quarterly", so we
  have a package for amd64 but not for aarch64.
  
  This commit should be reverted when we have a new quarterly branch.
  
  Sponsored by:	https://www.patreon.com/cperciva

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

Modified: stable/12/release/tools/ec2.conf
==============================================================================
--- stable/12/release/tools/ec2.conf	Sat May 30 02:52:24 2020	(r361644)
+++ stable/12/release/tools/ec2.conf	Sat May 30 02:56:13 2020	(r361645)
@@ -6,7 +6,14 @@
 # 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 ebsnvme-id"
+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
 
 # 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.