From 7da2a93f33bbc3f8decbc450425e37abc7f3501c Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Tue, 22 Sep 2020 18:18:57 +0000 Subject: [PATCH] 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.) --- release/tools/ec2.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 88d29990218..440c69cc95f 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. -- 2.45.0