Hi,
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).
I will argue that mr.fs target isn't the place for such per-arch
customization as runlist.sh supports MKDIR directive from the list
file.
The diff belows put back mr.fs target identical to others archs and
make the directories to be created with directives from list file.
Please note that armv7 already uses such MKDIR directives for the same
purpose (usr/mdec/xxx directory creation).
Comments or OK ?
--
Sebastien Marie
diff 1c9ddf109f6795c0adfcf5b19fd0bc61b3839042 /home/semarie/repos/openbsd/src
blob - 04b89cbda8d32468e5e91d2785b43d8e6094d90b
file + distrib/arm64/ramdisk/Makefile
--- distrib/arm64/ramdisk/Makefile
+++ distrib/arm64/ramdisk/Makefile
@@ -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} \
blob - 6e7a37085a9024988fd24d7d63a5689ea78aed4c
file + distrib/arm64/ramdisk/list
--- distrib/arm64/ramdisk/list
+++ distrib/arm64/ramdisk/list
@@ -91,6 +91,7 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firm
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.
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
