From b7da1a153c45053db93a1a5a85159166ccba93f0 Mon Sep 17 00:00:00 2001 From: krw Date: Tue, 25 Apr 2023 12:13:15 +0000 Subject: [PATCH] Create & use variables MRDISKTYPE and MRMAKEFSARGS like all the other build makefiles. Fixes & ok kn@ No intentional functional change. --- sys/arch/octeon/stand/boot/Makefile | 7 +++++-- sys/arch/powerpc64/stand/boot/Makefile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/arch/octeon/stand/boot/Makefile b/sys/arch/octeon/stand/boot/Makefile index 47feb4a3eef..750e158face 100644 --- a/sys/arch/octeon/stand/boot/Makefile +++ b/sys/arch/octeon/stand/boot/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.9 2022/01/07 10:48:59 visa Exp $ +# $OpenBSD: Makefile,v 1.10 2023/04/25 12:13:15 krw Exp $ NOMAN= #MAN= boot.8 RDBOOT= ${.CURDIR}/../rdboot/obj/rdboot +MRDISKTYPE= rdroot +MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=1024 + .if ${MACHINE} == "octeon" all: bsd rdboot @@ -24,7 +27,7 @@ mr.fs: rdboot install -d -o root -g wheel $@.d/sbin install -o ${BINOWN} -g ${BINGRP} -m 555 rdboot $@.d/sbin/init cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot - makefs -o disklabel=rdboot,minfree=0,density=1024 $@ $@.d + makefs ${MRMAKEFSARGS} $@ $@.d boot: bsd mr.fs cp bsd boot diff --git a/sys/arch/powerpc64/stand/boot/Makefile b/sys/arch/powerpc64/stand/boot/Makefile index 04f2a3f36a5..98545a06a87 100644 --- a/sys/arch/powerpc64/stand/boot/Makefile +++ b/sys/arch/powerpc64/stand/boot/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.2 2022/01/07 10:48:59 visa Exp $ +# $OpenBSD: Makefile,v 1.3 2023/04/25 12:13:15 krw Exp $ NOMAN= #MAN= boot.8 RDBOOT= ${.CURDIR}/../rdboot/obj/rdboot +MRDISKTYPE= rdroot +MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=1024 + .if ${MACHINE} == "powerpc64" all: bsd rdboot @@ -24,7 +27,7 @@ mr.fs: rdboot install -d -o root -g wheel $@.d/sbin install -o ${BINOWN} -g ${BINGRP} -m 555 rdboot $@.d/sbin/init cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot - makefs -o disklabel=rdboot,minfree=0,density=1024 $@ $@.d + makefs ${MRMAKEFSARGS} $@ $@.d boot: bsd mr.fs cp bsd boot -- 2.20.1