summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-09-09 12:55:44 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-09-09 12:55:44 +0000
commitf4c8e703d1f9b329308ce8ec268bd6dc9ac41661 (patch)
treef424750de63cb8e9024836352e5790b56ff65abf
parent02cfdc4001c7e191b32d38fc14da70e971988d22 (diff)
Add mips64/octeon bits
Still fails due to the disklabel/vnd kernel race but running into failing 'installboot -p' helps exercising the fsck/newfs exit code fix. REGRESS_EXIT_EARLY=1 runs past the prepare target without the diff but properly stops with it as installboot now exits 1 if system(3) fails.
-rw-r--r--regress/usr.sbin/installboot/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 8eeab25854f..a64d190f010 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2022/09/07 10:07:39 kn Exp $
+# $OpenBSD: Makefile,v 1.26 2022/09/09 12:55:43 kn Exp $
INSTALLBOOT ?= /usr/sbin/installboot
DRY_RUN = ${INSTALLBOOT} -n
@@ -24,6 +24,10 @@ USE_SOFTRAID ?= No
FORMAT_DISK = fdisk -iy -b '2048@1:06'
STAGENAMES = ofwboot
USE_SOFTRAID ?= No
+.elif ${MACHINE} == "octeon"
+FORMAT_DISK = fdisk -iy -b '65536@64:C'
+STAGENAMES = boot
+USE_SOFTRAID ?= No
.elif ${MACHINE} == "powerpc64"
FORMAT_DISK = fdisk -iy -b '32768@32768:C'
STAGENAMES = boot