svn commit: r367177 - in head/release: scripts tools

[Mitchell Horne]

Author: mhorne
Date: Fri Oct 30 18:20:52 2020
New Revision: 367177
URL: https://svnweb.freebsd.org/changeset/base/367177

Log:
  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

Modified:
  head/release/scripts/mk-vmimage.sh
  head/release/tools/vmimage.subr

Modified: head/release/scripts/mk-vmimage.sh
==============================================================================
--- head/release/scripts/mk-vmimage.sh	Fri Oct 30 18:18:25 2020	(r367176)
+++ head/release/scripts/mk-vmimage.sh	Fri Oct 30 18:20:52 2020	(r367177)
@@ -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

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Fri Oct 30 18:18:25 2020	(r367176)
+++ head/release/tools/vmimage.subr	Fri Oct 30 18:20:52 2020	(r367177)
@@ -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