update from netbsd

1 files changed, 34 insertions, 22 deletions

diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile
index b3defc8ae66..9e22b7ca78c 100644
--- a/distrib/sun3/miniroot/Makefile
+++ b/distrib/sun3/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1995/10/13 16:46:47 gwr Exp $
+#	$NetBSD: Makefile,v 1.3 1995/11/21 21:19:12 gwr Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -13,45 +13,57 @@ TREE=	${TOP}/common/${IMAGE}.tree
 LISTS=	${TOP}/common/mini_sbin.list \
 	${TOP}/common/mini_bin.list \
 	${TOP}/common/${CBIN}.list \
+	${TOP}/common/mini_xx.list \
 	${TOP}/common/${IMAGE}.list
 
-MOUNT_POINT=	/mnt
-DISKTYPE=	miniroot
-BDEV=		/dev/sd2b
-CDEV=		/dev/rsd2b
-
 KERNEL=${SRCSYSDIR}/arch/sun3/compile/GENERIC/netbsd
 
-# These are all the parameters for the miniroot: (6MB)
-NBLKS=		12288
-# old format, minfree, opt,  b/i  trks, sects, cpg
+MOUNT_POINT=	/mnt
+#BDEV=		/dev/sd2b
+#CDEV=		/dev/rsd2b
+BDEV=		/dev/sd0d
+CDEV=		/dev/rsd0d
+
+# These are all the parameters for the miniroot: (8MB)
+DISKTYPE=	miniroot
+NBLKS=		16384
+# old format, minfree, opt, b/i  trks, sects, cpg
 NEWFSARGS= -O -m 0 -o space -i 8192 -t 8 -u 32 -c 16
 
-${IMAGE}.fs: ${CBIN} do_mount do_files do_bootxx do_kernel do_umount
-	dd if=${CDEV} of=$@ bs=64b count=`expr ${NBLKS} / 64`
+CLEANFILES= ${IMAGE}.gz
 
-# Only do these for the miniroot, not the ramdisk.
-do_bootxx:
+${IMAGE}.gz: ${TREE} ${LISTS} ${CBIN} mini_xx
+	-newfs ${NEWFSARGS} -s ${NBLKS} ${CDEV} ${DISKTYPE}
+	mount ${BDEV} ${MOUNT_POINT}
+	mtree -def ${TREE} -p ${MOUNT_POINT}/ -u
+	TOPDIR=${TOP} CURDIR=${.CURDIR} \
+	  OBJDIR=${.OBJDIR} TARGDIR=${MOUNT_POINT} \
+	  sh ${TOP}/common/RunList.sh ${LISTS}
 	sync ; sleep 1 ; sync
 	cd ${MOUNT_POINT} ;\
 	  usr/mdec/installboot -v ufsboot usr/mdec/bootxx ${CDEV}
-
-# Copy the generic kernel
-do_kernel:
-	cp -p ${KERNEL} ${MOUNT_POINT}/netbsd
+	cp ${KERNEL} ${MOUNT_POINT}/netbsd
+	sync
+	@echo ""
+	@df -i ${MOUNT_POINT}
+	@echo ""
+	-umount ${MOUNT_POINT}
+	dd if=${CDEV} bs=16b count=`expr ${NBLKS} / 16` |\
+	  gzip > ${IMAGE}.tmp
+	-mv -f ${IMAGE}.tmp ${IMAGE}.gz
 
 # Do not delete this if I change my mind and kill make...
-.PRECIOUS: ${IMAGE}.fs
-
-# Rules used making ${IMAGE}.fs (do_*)
-.include "${TOP}/common/Make.fsimage"
+.PRECIOUS: ${IMAGE}.gz
 
 # Rules for making ${CBIN} ...
 .include "${TOP}/common/Make.crunch"
 
-clean cleandir:
+clean cleandir: clean_xx
 	-rm -f a.out core *.core *.o
 	-rm -f ${CLEANFILES}
 
 # Standard rules needed by the above...
 .include <bsd.obj.mk>
+
+# Hacks for re-linking some program -static
+.include "${TOP}/common/mini_xx.mk"