From 01b7329605347f147872c5b71b6f3ee3a8a0fd1c Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 20 Mar 2019 07:19:09 +0000
Subject: [PATCH] Pass --arm64 to bsdec2-image-upload when building ARM64 AMIs.

Future commits will allow the resulting EC2 AMIs to actually boot and
be usable.
---
 release/Makefile.ec2 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 32757f185607..d35f166a03d4 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -42,6 +42,9 @@ PUBLICSNAP=	--publicsnap
 EC2SNSREL=	${REVISION}-${BRANCH}
 EC2SNSVERS=	${EC2_SVNBRANCH}@${EC2_SVNREV}
 .endif
+.if ${TARGET_ARCH} != "amd64"
+EC2ARCH=	--${TARGET_ARCH:S/aarch64/arm64/}
+.endif
 
 CLEANFILES+=		ec2ami
 
@@ -82,7 +85,8 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
-	/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} --sriov --ena \
+	/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \
+	    ${EC2ARCH} --sriov --ena \
 	    ${.OBJDIR}/ec2.raw \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
 	    "${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \