From 3e6e2f5f53ac1a48e864e75195306c776ff0d59c Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Thu, 1 Sep 2022 00:43:14 +0000
Subject: [PATCH] Add macppc bits, hook up installboot(8) tests on macppc

Default tests (USE_SOFTRAID=No, NDISKS=1) pass except for 'vnd0 ./ofwboot'
as reported on tech@ (fix pending).
---
 regress/usr.sbin/Makefile             | 3 ++-
 regress/usr.sbin/installboot/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile
index 015e48dbfac..a9d3bf88868 100644
--- a/regress/usr.sbin/Makefile
+++ b/regress/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2022/09/01 00:13:35 kn Exp $
+#	$OpenBSD: Makefile,v 1.31 2022/09/01 00:43:14 kn Exp $
 
 SUBDIR += acme-client
 SUBDIR += arp
@@ -22,6 +22,7 @@ SUBDIR += vmd
 
 .if ${MACHINE} == "amd64" || \
     ${MACHINE} == "i386" || \
+    ${MACHINE} == "macppc" || \
     ${MACHINE} == "sparc64"
 SUBDIR += installboot
 .endif
diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 03cb73945a7..a85d20f8211 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2022/08/31 23:53:22 kn Exp $
+#	$OpenBSD: Makefile,v 1.14 2022/09/01 00:43:15 kn Exp $
 
 INSTALLBOOT ?=		/usr/sbin/installboot
 DRY_RUN =		${INSTALLBOOT} -n
@@ -17,6 +17,10 @@ USE_SOFTRAID ?=		Yes
 FORMAT_DISK =		fdisk -g -y -b32768
 STAGENAMES =		BOOTAA64.EFI
 USE_SOFTRAID ?=		Yes
+.elif ${MACHINE} == "macppc"	# assume MBR
+FORMAT_DISK =		fdisk -iy -b2048@1:06
+STAGENAMES =		ofwboot
+USE_SOFTRAID ?=		No
 .elif ${MACHINE} == "sparc64"
 FORMAT_DISK =		true	# NOOP
 STAGENAMES =		bootblk ofwboot
-- 
2.20.1