From: miod Date: Tue, 20 Oct 2015 16:22:47 +0000 (+0000) Subject: ... but keep the previous logic for sparc, which is the other user of this X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e43d4df22a6ec2905a96a396d4ec27e8aabfb073;p=openbsd ... but keep the previous logic for sparc, which is the other user of this Makefile, until it switches to MI installboot, too. --- diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 618df4339bb..5029115fd78 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2015/10/20 16:18:23 miod Exp $ +# $OpenBSD: Makefile,v 1.45 2015/10/20 16:22:47 miod Exp $ REV= ${OSrev} @@ -62,8 +62,16 @@ ${FLOPPY}: bsd.gz ${BOOT} ${BOOTXX} disklabel -w ${VND} ${FLOPPYTYPE} newfs ${NEWFSOPTS_FD} ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} +.if ${MACHINE} == "sparc" + cp ${BOOT} ${MOUNT_POINT}/ +.endif cp bsd.gz ${MOUNT_POINT}/bsd +.if ${MACHINE} == "sparc" + ${INSTALLBOOT} -v ${BOOTIN} ${BOOTXX} \ + `echo ${VND_RDEV} | sed -e 's/a$$/c/'` +.else ${INSTALLBOOT} -v -r ${MOUNT_POINT} ${VND} ${BOOTXX} ${BOOT} +.endif @echo "" @df -i ${MOUNT_POINT} @echo ""