summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2014-11-26 08:18:18 +0000
committerstsp <stsp@openbsd.org>2014-11-26 08:18:18 +0000
commit773ed9220196938e0c30f8afd7f5575c9921183e (patch)
treecb89e46dda04580aa225630e8e9ea8897b792258
parentHook ofwbootfd to the build. (diff)
downloadwireguard-openbsd-773ed9220196938e0c30f8afd7f5575c9921183e.tar.xz
wireguard-openbsd-773ed9220196938e0c30f8afd7f5575c9921183e.zip
Use ofwbootfd on sparc64 floppies. Avoids problems when ofwboot grows.
-rw-r--r--distrib/sparc64/ramdisk/Makefile6
-rw-r--r--distrib/sparc64/ramdiskB/Makefile6
2 files changed, 6 insertions, 6 deletions
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 5475f28f0d8..7ceaa079106 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2014/11/22 15:02:27 deraadt Exp $
+# $OpenBSD: Makefile,v 1.30 2014/11/26 08:18:18 stsp Exp $
TOP= ${.CURDIR}/..
@@ -61,9 +61,9 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/
disklabel -w ${VND} ${FLOPPYTYPE}
newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
- cp ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/
+ cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
cp bsd.gz ${MOUNT_POINT}/bsd
- installboot -v ${VND}
+ installboot -v ${VND} /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index d321e67309b..d8786462b9a 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2014/11/22 15:02:28 deraadt Exp $
+# $OpenBSD: Makefile,v 1.23 2014/11/26 08:18:25 stsp Exp $
TOP= ${.CURDIR}/..
@@ -61,9 +61,9 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/
disklabel -w ${VND} ${FLOPPYTYPE}
newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
- cp ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/
+ cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
cp bsd.gz ${MOUNT_POINT}/bsd
- installboot -v ${VND}
+ installboot -v ${VND} /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
@echo ""
@df -i ${MOUNT_POINT}
@echo ""