aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorMitchell Horne <mhorne@FreeBSD.org>2020-10-30 18:20:52 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2020-10-30 18:20:52 +0000
commit1d76e25a67dc33464428bba05d28ac98a71ea47c (patch)
treed4e3fda0430a51be628ce9cb69a78bc1eef7eab7 /release
parent0d51f9e58981094b27753669aa8311d4ab157868 (diff)
downloadsrc-1d76e25a67dc33464428bba05d28ac98a71ea47c.tar.gz
src-1d76e25a67dc33464428bba05d28ac98a71ea47c.zip
arm64: convert virtual machine images to GPT
These images were switched to MBR in r281876 as a way to cope with a hard-coded partition GUID in QEMU's default EFI firmware. Enough time has passed that this is no longer a problem; QEMU versions >= 4.0 include a copy of edk2 EFI firmware that can detect the root filesystem properly. Alternatively, sysutils/u-boot-qemu-arm64 can be used. Switch back to building these images with a GPT partition table, and re-enable the swap partition. Reviewed by: gjb, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26986
Notes
Notes: svn path=/head/; revision=367177
Diffstat (limited to 'release')
-rwxr-xr-xrelease/scripts/mk-vmimage.sh10
-rw-r--r--release/tools/vmimage.subr4
2 files changed, 3 insertions, 11 deletions
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index fd84216a99fe..cf795e04655b 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -93,15 +93,7 @@ main() {
. "${VMCONFIG}"
fi
- case ${TARGET}:${TARGET_ARCH} in
- arm64:aarch64)
- ROOTLABEL="ufs"
- NOSWAP=1
- ;;
- *)
- ROOTLABEL="gpt"
- ;;
- esac
+ ROOTLABEL="gpt"
vm_create_base
vm_install_base
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 1f4d40ce913f..bec191e9f55d 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -32,9 +32,9 @@ write_partition_layout() {
;;
arm64:aarch64)
ESP=yes
- SCHEME=mbr
+ SCHEME=gpt
BOOTPARTS=
- ROOTFSPART="-p freebsd:=${VMBASE}"
+ ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
;;
powerpc:powerpc*)
ESP=no