Convert to NDWO build.

(From Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>)

distrib/news68k/floppies/bootfloppy/Makefile

@@ -1,65 +1,23 @@
-#	$NetBSD: Makefile,v 1.12 2002/05/02 18:02:44 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2002/05/20 16:14:20 lukem Exp $
 
-
-.include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
-IMAGE=		boot.fs
-KERNDIR!=	cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
-KERN=		${KERNDIR}/netbsd.INSTALL.gz
+FLOPPYBASE=	boot
+FLOPPYSIZE=	2880
+FLOPPYFILES=	boot netbsd
+FLOPPYMAX=	2
+FLOPPYSUFFIX=	.fs
+
+FLOPPY_RELEASEDIR=	installation/floppy
 
-MOUNT_POINT?=	/mnt
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_CRDEV=	/dev/r${VND}c
-FD?=		fd0
-FD_RDEV=	/dev/r${FD}a
-IMAGE?=		xxx.fs
-KERN?=		netbsd-xxx
 MDEC=		${DESTDIR}/usr/mdec
+KERNOBJ!=	cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
+FLOPPY_NETBSD=	${KERNOBJ}/netbsd.INSTALL.gz
+FLOPPY_BOOT=	${MDEC}/boot
+FLOPPYINSTBOOT= \
+    "${INSTALLBOOT} -m ${MACHINE} -t raw -v -B 17 @IMAGE@ ${MDEC}/bootxx boot"
 
-DISKTYPE=	floppy
-
-CLEANFILES+=	${IMAGE}
-
-# Some reasonable values for the -i parameter to newfs are:
-#
-#  8192		1387k, 189 inodes free
-# 16384		1399k,  93 inodes free
-# 65536		1407k,  29 inodes free
-INO_BYTES?=	65536
-
-all:	${KERN}
-	dd if=/dev/zero of=${IMAGE} bs=1440k count=1
-	vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE}
-	disklabel -rw ${VND} ${DISKTYPE}
-	newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 \
-	    -f 1024 -b 8192 ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	cp ${KERN} ${MOUNT_POINT}/netbsd
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
-	@echo "installing new bootblocks"
-	-rm -f ${MOUNT_POINT}/boot
-	cp ${MDEC}/boot ${MOUNT_POINT}/boot
-	sync
-	${MDEC}/installboot -v ${MOUNT_POINT}/boot ${MDEC}/bootxx ${VND_CRDEV}
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-release: check_RELEASEDIR .WAIT ${IMAGE}
-	${RELEASE_INSTALL} ${IMAGE} ${RELEASEDIR}/installation/floppy
-	# XXX: do we want both?
-	gzip -c -9 ${IMAGE} > ${RELEASEDIR}/installation/floppy/${IMAGE}.gz
-
-real-floppy:
-	dd if=${IMAGE} of=${FD_RDEV} bs=45k
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
 
 .include <bsd.prog.mk>

distrib/newsmips/floppies/bootfloppy/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2002/05/04 01:34:38 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 2002/05/20 16:14:20 lukem Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,8 +15,8 @@ MDEC=		${DESTDIR}/usr/mdec
 KERNOBJ!=	cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
 FLOPPY_NETBSD=	${KERNOBJ}/netbsd.INSTALL.gz
 FLOPPY_BOOT=	${MDEC}/boot
-#	XXXDISTRIB: need MI installboot for newsmips
-FLOPPYINSTBOOT=	"${MDEC}/installboot -v -b 17 boot ${MDEC}/bootxx @IMAGE@"
+FLOPPYINSTBOOT=	\
+    "${INSTALLBOOT} -m ${MACHINE} -t raw -v -B 17 @IMAGE@ ${MDEC}/bootxx boot"
 
 .include "${DISTRIBDIR}/common/Makefile.tarfloppy"