From 3778fa3e3c3e7f7863e342ef6dbfe1427fc31cf0 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Thu, 9 May 2002 11:12:48 +0000
Subject: [PATCH] convert to NDWO.  (that's sparc done!)

---
 distrib/sparc/instfs/Makefile | 46 ++++++++++++-----------------------
 distrib/sparc/instfs/exclude  |  1 -
 2 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 distrib/sparc/instfs/exclude

diff --git a/distrib/sparc/instfs/Makefile b/distrib/sparc/instfs/Makefile
index ec13b90cba9b..a19d14e202b5 100644
--- a/distrib/sparc/instfs/Makefile
+++ b/distrib/sparc/instfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2002/05/02 18:02:53 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2002/05/09 11:12:48 lukem Exp $
 #
 # instfs.tgz is the filesystem image for disk 2 of the floppy based
 # installation method.
@@ -9,39 +9,25 @@
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
-MINIROOT=	${.CURDIR}/../../miniroot
+IMAGETAR=		instfs.tgz
+IMAGETAR_RELEASEDIR=	installation/bootfs
 
-MOUNT_POINT?=	/mnt
-# DEV/RDEV file system device, CDEV/RDEV vnconfig device
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_CRDEV=	/dev/r${VND}c
-INSTFS?=	instfs.tgz
+MINIROOTDIR!=	cd ${.CURDIR}/../../miniroot && ${PRINTOBJDIR}
+WORKDIR=	${MINIROOTDIR}/work
+WORKBUILT=	${MINIROOTDIR}/work.built
+WORKSPEC=	instfs.spec
 
-MINIROOTDIR!=	cd ${MINIROOT} && ${PRINTOBJDIR}
-MINIROOT_IMAGE=	${MINIROOTDIR}/miniroot.fs
+${WORKSPEC}: ${MINIROOTDIR}/work.spec
+	-rm -f ${.TARGET} ${.TARGET}.tmp
+	egrep -v '^\./(netbsd|boot)($$|[ \t])' ${.ALLSRC} > ${.TARGET}.tmp \
+	&& mv ${.TARGET}.tmp ${.TARGET}
 
-all: ${INSTFS}
+CLEANFILES+=	${WORKSPEC} ${WORKSPEC}.tmp
 
-${INSTFS}: ${MINIROOT_IMAGE}
-	vnconfig -v -c ${VND} ${MINIROOT_IMAGE}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	(cd ${MOUNT_POINT}; \
-		tar -z -X ${.CURDIR}/exclude -c -f ${.OBJDIR}/${.TARGET} .)
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
+${WORKBUILT}:
+	@echo "Need ../../miniroot built first"
+	@false
 
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${INSTFS}
-
-clean cleandir distclean:
-	/bin/rm -f *.core ${INSTFS}
-
-release: check_RELEASEDIR .WAIT ${INSTFS}
-	${RELEASE_INSTALL} ${INSTFS} $(RELEASEDIR)/installation/bootfs
+.include "${DISTRIBDIR}/common/Makefile.image"
 
 .include <bsd.prog.mk>
diff --git a/distrib/sparc/instfs/exclude b/distrib/sparc/instfs/exclude
deleted file mode 100644
index dccfe7104200..000000000000
--- a/distrib/sparc/instfs/exclude
+++ /dev/null
@@ -1 +0,0 @@
-netbsd