From 3e61880243290f320cae6ddc666b3e869a2fa72f Mon Sep 17 00:00:00 2001 From: kn Date: Thu, 1 Sep 2022 17:23:36 +0000 Subject: [PATCH] Fill the gaps for armv7, powerpc64 and riscv64 These still fail early on due to the opendev(3)/diskmap(4) race condition, so only hook them up after the kernel is fixed. Note to self: some distrib/${MACHINE}/ramdisk/install.md pass explicit newfs(8) flags -- this might be needed here; test once all the relevant kernel and installboot(8) bugs are squashed and this regress suite can be run normally. --- regress/usr.sbin/installboot/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile index 544075f5412..93496db1884 100644 --- a/regress/usr.sbin/installboot/Makefile +++ b/regress/usr.sbin/installboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2022/09/01 08:52:30 kn Exp $ +# $OpenBSD: Makefile,v 1.17 2022/09/01 17:23:36 kn Exp $ INSTALLBOOT ?= /usr/sbin/installboot DRY_RUN = ${INSTALLBOOT} -n @@ -17,10 +17,22 @@ USE_SOFTRAID ?= Yes FORMAT_DISK = fdisk -g -y -b32768 STAGENAMES = BOOTAA64.EFI USE_SOFTRAID ?= Yes +.elif ${MACHINE} == "armv7" +FORMAT_DISK = fdisk -g -y -b32768@32768:C +STAGENAMES = BOOTARM.EFI +USE_SOFTRAID ?= No .elif ${MACHINE} == "macppc" # assume MBR FORMAT_DISK = fdisk -iy -b2048@1:06 STAGENAMES = ofwboot USE_SOFTRAID ?= No +.elif ${MACHINE} == "powerpc64" +FORMAT_DISK = fdisk -iy -b32768@32768:C +STAGENAMES = boot +USE_SOFTRAID ?= No +.elif ${MACHINE} == "riscv64" +FORMAT_DISK = fdisk -g -y -b32768@32768:C +STAGENAMES = BOOTRISCV64.EFI +USE_SOFTRAID ?= No .elif ${MACHINE} == "sparc64" FORMAT_DISK = true # NOOP STAGENAMES = bootblk ofwboot -- 2.20.1