Page MenuHomeFreeBSD
Files F162421398

D18371.id51301.diff
No OneTemporary
Actions

D18371.id51301.diff
View Options

Index: release/Makefile.ec2
===================================================================
--- release/Makefile.ec2
+++ release/Makefile.ec2
@@ -38,6 +38,9 @@
.if defined(EC2PUBLICSNAP) && !empty(EC2PUBLICSNAP)
PUBLICSNAP= --publicsnap
.endif
+.if ${TARGET_ARCH} != "amd64"
+EC2_ARCH= --${TARGET_ARCH:S/aarch64/arm64/}
+.endif
.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH}
EC2SNSVERS= ${EC2_SVNBRANCH}@${EC2_SVNREV}
@@ -82,7 +85,7 @@
@echo "--------------------------------------------------------------"
@false
.endif
- /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} --sriov --ena \
+ /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} ${EC2_ARCH} --sriov --ena \
${.OBJDIR}/ec2.raw \
"${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
"${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \
Index: release/scripts/mk-vmimage.sh
===================================================================
--- release/scripts/mk-vmimage.sh
+++ release/scripts/mk-vmimage.sh
@@ -93,15 +93,7 @@
. "${VMCONFIG}"
fi
- case ${TARGET}:${TARGET_ARCH} in
- arm64:aarch64)
- ROOTLABEL="ufs"
- NOSWAP=1
- ;;
- *)
- ROOTLABEL="gpt"
- ;;
- esac
+ ROOTLABEL="gpt"
vm_create_base
vm_install_base
Index: release/tools/vmimage.subr
===================================================================
--- release/tools/vmimage.subr
+++ release/tools/vmimage.subr
@@ -29,7 +29,7 @@
-o ${VMIMAGE}
;;
arm64:aarch64)
- mkimg -s mbr -f ${VMFORMAT} \
+ mkimg -s gpt -f ${VMFORMAT} \
-p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
-p freebsd:=${VMBASE} \
-o ${VMIMAGE}

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 14, 2:47 AM (15 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35053389
Default Alt Text
D18371.id51301.diff (1 KB)

Event Timeline