Page MenuHomeFreeBSD
Files F153858522

D18371.diff
No OneTemporary
Actions

D18371.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
@@ -24,9 +24,13 @@
case "${TARGET}:${TARGET_ARCH}" in
amd64:amd64 | i386:i386)
+ # Create an ESP
+ espfilename=$(mktemp /tmp/efiboot.XXXXXX)
+ make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
mkimg -s gpt -f ${VMFORMAT} \
-b ${BOOTFILES}/i386/pmbr/pmbr \
-p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \
+ -p efi/esp:=${espfilename} \
${SWAPOPT} \
-p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
@@ -35,9 +39,9 @@
# Create an ESP
espfilename=$(mktemp /tmp/efiboot.XXXXXX)
make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
- mkimg -s mbr -f ${VMFORMAT} \
- -p efi:=${espfilename} \
- -p freebsd:=${VMBASE} \
+ mkimg -s gpt -f ${VMFORMAT} \
+ -p efi/esp:=${espfilename} \
+ -p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
rm ${espfilename}
;;

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 25, 7:43 AM (12 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32116588
Default Alt Text
D18371.diff (2 KB)

Event Timeline