diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2022-09-01 00:43:16 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2022-09-01 00:43:16 +0000 |
| commit | 4b25a265b7670230e054a971584bd41a63dc42c6 (patch) | |
| tree | 5b11303f503d903e770721ae17da1ab04bbc9171 /regress/usr.sbin | |
| parent | 31ac4978244bccd9ce9f48b93b91d0edc670e950 (diff) | |
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).
Diffstat (limited to 'regress/usr.sbin')
| -rw-r--r-- | regress/usr.sbin/Makefile | 3 | ||||
| -rw-r--r-- | 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 |