From c2ec81004a72d893084437ec099d90d9373581fd Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Fri, 28 Apr 2023 08:45:24 +0000
Subject: [PATCH] Retire -E's "expert" mode. Introduced 23 years ago to avoid
 confusing users with FFS attributes that only experts should fiddle with.
 Actual use has withered away with functionality rendered moot or moved
 elsewhere.

'-e' remains for the truly obscure corner cases.

Simply excise the code for now to see if hidden users/uses are
exposed.  Further simplifications are possible if no such
users/uses surface.

ok with sthen@ millert@ kn@ otto@
---
 distrib/alpha/miniroot/Makefile        | 6 +++---
 distrib/amd64/ramdiskA/Makefile        | 6 +++---
 distrib/amd64/ramdisk_cd/Makefile      | 6 +++---
 distrib/arm64/ramdisk/Makefile         | 6 +++---
 distrib/armv7/ramdisk/Makefile         | 6 +++---
 distrib/hppa/ramdisk/Makefile          | 6 +++---
 distrib/i386/ramdisk/Makefile          | 6 +++---
 distrib/i386/ramdisk_cd/Makefile       | 6 +++---
 distrib/landisk/ramdisk/Makefile       | 6 +++---
 distrib/loongson/ramdisk/Makefile      | 6 +++---
 distrib/luna88k/ramdisk/Makefile       | 6 +++---
 distrib/macppc/ramdisk/Makefile        | 6 +++---
 distrib/octeon/ramdisk/Makefile        | 6 +++---
 distrib/powerpc64/ramdisk/Makefile     | 6 +++---
 distrib/riscv64/ramdisk/Makefile       | 6 +++---
 distrib/sparc64/miniroot/Makefile      | 6 +++---
 distrib/sparc64/ramdisk/Makefile       | 6 +++---
 distrib/sparc64/ramdiskB/Makefile      | 6 +++---
 sys/arch/octeon/stand/boot/Makefile    | 6 +++---
 sys/arch/powerpc64/stand/boot/Makefile | 6 +++---
 20 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index da148703a7f..58323943cce 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2023/04/26 14:42:27 krw Exp $
+#	$OpenBSD: Makefile,v 1.25 2023/04/28 08:45:24 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5760
@@ -68,7 +68,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -77,7 +77,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
index fc9fabe46b9..f1252d0d585 100644
--- a/distrib/amd64/ramdiskA/Makefile
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2023/04/26 20:59:32 krw Exp $
+#	$OpenBSD: Makefile,v 1.18 2023/04/28 08:45:25 krw Exp $
 
 FS=		floppy${OSrev}.img
 FSSIZE=		2880
@@ -38,7 +38,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -47,7 +47,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index f4ef4f13212..72c9105bc23 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2023/04/24 17:07:34 krw Exp $
+#	$OpenBSD: Makefile,v 1.38 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		11392
@@ -62,7 +62,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -71,7 +71,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index 140304b23d9..248daf75b65 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2023/04/24 16:21:43 krw Exp $
+#	$OpenBSD: Makefile,v 1.28 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		88064
@@ -71,7 +71,7 @@ ${FS}: bsd.rd
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -80,7 +80,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index 6c79d9a5121..3f24cd08c1a 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2021/07/26 12:47:45 kn Exp $
+#	$OpenBSD: Makefile,v 1.29 2023/04/28 08:45:25 krw Exp $
 
 MTREE=		${UTILS}/mtree.conf
 RAMDISK=	RAMDISK
@@ -11,7 +11,7 @@ MRMAKEFSARGS=	-o disklabel=${MRDISKTYPE},minfree=0,density=4096
 
 all:	bsd.rd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -20,7 +20,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 7907b9724de..67310903d9f 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.48 2021/07/26 12:47:45 kn Exp $
+#	$OpenBSD: Makefile,v 1.49 2023/04/28 08:45:25 krw Exp $
 
 LIF=		lif${OSrev}.img
 CDROM=		cd${OSrev}.iso
@@ -32,7 +32,7 @@ ${CDROM}: bsd.rd
 bsd.lif: bsd.rd
 	(cat bsd.rd ; dd if=/dev/zero count=1) | gzip -9n > bsd.lif
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 	strip -R .SUNW_ctf bsd.rd
@@ -42,7 +42,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile
index 2de4ae85ffd..c4fd963d3e4 100644
--- a/distrib/i386/ramdisk/Makefile
+++ b/distrib/i386/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2023/04/26 14:42:27 krw Exp $
+#	$OpenBSD: Makefile,v 1.19 2023/04/28 08:45:25 krw Exp $
 
 FS=		floppy${OSrev}.img
 FSSIZE=		2880
@@ -35,7 +35,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -44,7 +44,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 7e1d7630276..36b771f0d5a 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2023/04/26 14:42:27 krw Exp $
+#	$OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		8448
@@ -54,7 +54,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -63,7 +63,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index 86f8dff98d5..a3548397991 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.35 2023/04/26 14:42:27 krw Exp $
+#	$OpenBSD: Makefile,v 1.36 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5120
@@ -35,7 +35,7 @@ ${FS}: bsd.gz
 bsd.gz: bsd.rd
 	gzip -9cn bsd.rd > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -44,7 +44,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile
index 02de565fcea..ddaba6928fe 100644
--- a/distrib/loongson/ramdisk/Makefile
+++ b/distrib/loongson/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2022/09/11 11:12:39 krw Exp $
+#	$OpenBSD: Makefile,v 1.34 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		18432
@@ -50,7 +50,7 @@ ${CDROM}: bsd.rd
 bsd.strip: bsd.rd
 	objcopy -S -R .comment -R .SUNW_ctf bsd.rd bsd.strip
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -59,7 +59,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index 66486e96eff..a9ca581a7e6 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2021/07/26 12:47:46 kn Exp $
+#	$OpenBSD: Makefile,v 1.33 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		8192
@@ -32,7 +32,7 @@ ${FS}: bsd.rd
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -41,7 +41,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index f97e177dcb9..dfe3bee8800 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.52 2021/11/11 20:25:56 kn Exp $
+#	$OpenBSD: Makefile,v 1.53 2023/04/28 08:45:25 krw Exp $
 
 CDROM=		cd${OSrev}.iso
 MTREE=		${UTILS}/mtree.conf
@@ -34,7 +34,7 @@ MRMAKEFSARGS=	-o disklabel=${MRDISKTYPE},minfree=0,density=4096
 bsd.gz: bsd.rd
 	gzip -9cn bsd.rd > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	objcopy -g -x -R .comment -R .SUNW_ctf \
 	    -K rd_root_size -K rd_root_image \
 	    bsd bsd.rd
@@ -45,7 +45,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile
index 25712eabba6..e3cea992121 100644
--- a/distrib/octeon/ramdisk/Makefile
+++ b/distrib/octeon/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2022/09/11 15:05:27 krw Exp $
+#	$OpenBSD: Makefile,v 1.23 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		24576
@@ -33,7 +33,7 @@ ${FS}: bsd.rd
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -42,7 +42,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/powerpc64/ramdisk/Makefile b/distrib/powerpc64/ramdisk/Makefile
index 601f1cb73cc..134cb45e3f4 100644
--- a/distrib/powerpc64/ramdisk/Makefile
+++ b/distrib/powerpc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2023/04/24 16:21:43 krw Exp $
+#	$OpenBSD: Makefile,v 1.7 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		67584
@@ -43,7 +43,7 @@ ${FS}: bsd.rd
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -52,7 +52,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/riscv64/ramdisk/Makefile b/distrib/riscv64/ramdisk/Makefile
index 1376084824e..49301def955 100644
--- a/distrib/riscv64/ramdisk/Makefile
+++ b/distrib/riscv64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2023/04/24 16:21:43 krw Exp $
+#	$OpenBSD: Makefile,v 1.8 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		67584
@@ -41,7 +41,7 @@ ${FS}: bsd.rd
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -50,7 +50,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 .for DIR in ${DIRS}
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 736271bc8da..9aa2ed62e9f 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2023/04/26 20:59:32 krw Exp $
+#	$OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		6400
@@ -64,7 +64,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -73,7 +73,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index f5ed65293a6..fe531f00c6b 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.55 2023/04/26 20:59:32 krw Exp $
+#	$OpenBSD: Makefile,v 1.56 2023/04/28 08:45:25 krw Exp $
 
 FS=		floppy${OSrev}.img
 FSSIZE=		2880
@@ -37,7 +37,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -46,7 +46,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index cae6dbea071..da50a1d794d 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.51 2023/04/26 20:59:32 krw Exp $
+#	$OpenBSD: Makefile,v 1.52 2023/04/28 08:45:26 krw Exp $
 
 FS=		floppyB${OSrev}.img
 FSSIZE=		2880
@@ -37,7 +37,7 @@ bsd.gz: bsd.rd
 	    bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
-bsd.rd: mr.fs bsd
+bsd.rd: mr.fs
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
@@ -46,7 +46,7 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
 	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
-mr.fs: instbin
+mr.fs: instbin bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
diff --git a/sys/arch/octeon/stand/boot/Makefile b/sys/arch/octeon/stand/boot/Makefile
index 750e158face..87f316b8ccf 100644
--- a/sys/arch/octeon/stand/boot/Makefile
+++ b/sys/arch/octeon/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2023/04/25 12:13:15 krw Exp $
+#	$OpenBSD: Makefile,v 1.11 2023/04/28 08:45:26 krw Exp $
 
 NOMAN=
 #MAN=		boot.8
@@ -20,7 +20,7 @@ rdboot: ${RDBOOT}
 	cp -p ${RDBOOT} rdboot
 	strip rdboot
 
-mr.fs: rdboot
+mr.fs: rdboot bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d/dev
 	install -d -o root -g wheel $@.d/mnt
@@ -29,7 +29,7 @@ mr.fs: rdboot
 	cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-boot: bsd mr.fs
+boot: mr.fs
 	cp bsd boot
 	rdsetroot boot mr.fs
 
diff --git a/sys/arch/powerpc64/stand/boot/Makefile b/sys/arch/powerpc64/stand/boot/Makefile
index 98545a06a87..a5435ad3d43 100644
--- a/sys/arch/powerpc64/stand/boot/Makefile
+++ b/sys/arch/powerpc64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2023/04/25 12:13:15 krw Exp $
+#	$OpenBSD: Makefile,v 1.4 2023/04/28 08:45:26 krw Exp $
 
 NOMAN=
 #MAN=		boot.8
@@ -20,7 +20,7 @@ rdboot: ${RDBOOT}
 	cp -p ${RDBOOT} rdboot
 	strip rdboot
 
-mr.fs: rdboot
+mr.fs: rdboot bsd
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d/dev
 	install -d -o root -g wheel $@.d/mnt
@@ -29,7 +29,7 @@ mr.fs: rdboot
 	cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-boot: bsd mr.fs
+boot: mr.fs
 	cp bsd boot
 	rdsetroot boot mr.fs
 
-- 
2.20.1