From: semarie <semarie@openbsd.org>
Date: Mon, 15 Feb 2021 07:06:03 +0000 (+0000)
Subject: distrib: arm64: avoid customization in mr.fs target
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=37afb64508d9884423031d8df683844c17af4c01;p=openbsd

distrib: arm64: avoid customization in mr.fs target

arm64 ramdisk has customization in mr.fs target, in order to create
usr/mdec/pine64 and usr/mdec/rpi directories (files will be copied
inside them by runlist.sh).

uses MKDIR directive to create these directories instead of.

it put back mr.fs target identical to others archs.

ok deraadt@
---

diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index 04b89cbda8d..7d398fdb3eb 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2020/05/18 06:20:43 otto Exp $
+#	$OpenBSD: Makefile,v 1.21 2021/02/15 07:06:03 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		67584
@@ -24,10 +24,6 @@ UTILS=		${.CURDIR}/../../miniroot
 MRFSDISKTYPE=	rdroot
 MRMAKEFSARGS=	-o disklabel=${MRFSDISKTYPE},minfree=0,density=4096
 
-DIRS=\
-	pine64 \
-	rpi
-
 PIFILES=\
 	bootcode.bin \
 	start.elf \
@@ -85,9 +81,6 @@ bsd:
 mr.fs: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
-.for DIR in ${DIRS}
-	mkdir -p $@.d/usr/mdec/${DIR}
-.endfor
 	mtree -def ${MTREE} -p $@.d -u
 	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list
index 6e7a37085a9..b8493098a8a 100644
--- a/distrib/arm64/ramdisk/list
+++ b/distrib/arm64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2019/11/17 06:03:39 jsg Exp $
+#	$OpenBSD: list,v 1.13 2021/02/15 07:06:03 semarie Exp $
 
 SRCDIRS distrib/special
 
@@ -91,6 +91,7 @@ COPY	${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int
 COPY	${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext
 COPY	${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int
 
+MKDIR	usr/mdec/rpi
 COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b.dtb usr/mdec/rpi/bcm2710-rpi-3-b.dtb
 COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b-plus.dtb usr/mdec/rpi/bcm2710-rpi-3-b-plus.dtb
 COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-cm3.dtb usr/mdec/rpi/bcm2710-rpi-cm3.dtb
@@ -100,6 +101,7 @@ COPY	/usr/local/share/raspberrypi-firmware/boot/fixup.dat usr/mdec/rpi/fixup.dat
 COPY	/usr/local/share/raspberrypi-firmware/boot/overlays/disable-bt.dtbo usr/mdec/rpi/disable-bt.dtbo
 COPY	/usr/local/share/u-boot/rpi_3/u-boot.bin usr/mdec/rpi/u-boot.bin
 
+MKDIR	usr/mdec/pine64
 COPY	/usr/local/share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin usr/mdec/pine64/u-boot-sunxi-with-spl.bin
 
 # copy the MAKEDEV script and make some devices