Make a floppy image. Some cleanup

1 files changed, 46 insertions, 11 deletions

diff --git a/distrib/alpha/ramdisk/Makefile b/distrib/alpha/ramdisk/Makefile
index d038ad1722b..b44f7529090 100644
--- a/distrib/alpha/ramdisk/Makefile
+++ b/distrib/alpha/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1997/05/07 16:23:05 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/05/08 00:50:01 niklas Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -17,35 +17,71 @@ VND_CRDEV=	/dev/r${VND}c
 PID!=		echo $$$$
 REALIMAGE!=	echo /tmp/image.${PID}
 
+STRIP?=		strip
+GZIP?=		gzip
+GZIPFLAGS?=	-9f
+INSTALLBOOT?=	/usr/mdec/installboot
+
+FLOPPY?=	floppy.fs
+FLOPPYBLKS?=	2880
+FLOPPYTYPE?=	floppy3
+BOOT?=		/usr/mdec/boot
+BOOTXX?=	/usr/mdec/bootxx
+
 .include "${TOP}/inst-common/Makefile.inc"
 
-all: ${CBIN} ${IMAGE}
+all: ${CBIN} ${FLOPPY}
 	@echo "all done"
 
 DISKTYPE=       rdroot
-NBLKS=          5120
+NBLKS=          8192
+
 # old format, minfree, opt, b/i  trks, sects, cpg
-NEWFSARGS= -t ffs -m 0 -o space -c 16 -i 16384
+NEWFSARGS=	-t ffs -m 0 -o space
+NEWFSARGS_RD=	-i 16384 -c 16
+NEWFSARGS_FD=	-i 524288 -c 80
+
+${FLOPPY}:	bsd.gz
+	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYBLKS}
+	vnconfig -v -c ${VND} ${REALIMAGE}
+	disklabel -w -r ${VND} ${FLOPPYTYPE}
+	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV} \
+	    ${FLOPPYTYPE}
+	mount ${VND_DEV} ${MOUNT_POINT}
+	cp bsd.gz ${MOUNT_POINT}/bsd
+	cp ${BOOT} ${MOUNT_POINT}
+	${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} ${VND_CRDEV}
+	@echo ""
+	@df -i ${MOUNT_POINT}
+	@echo ""
+	umount ${MOUNT_POINT}
+	vnconfig -u ${VND}
+	cat /*bin/* > /dev/null
+	# some bug can put an extra 8k at the end it seems
+	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYBLKS}
 
-setroot: ${IMAGE} bsd ecoffrdsetroot
+bsd.gz: ${KERNEL} ${IMAGE} ecoffrdsetroot
+	cp ${KERNEL} bsd
 	${.OBJDIR}/ecoffrdsetroot bsd < ${IMAGE}
+	${STRIP} bsd
+	${GZIP} ${GZIPFLAGS} bsd
 
 ${IMAGE}:	do_prep do_mount do_files do_umount
 	mv -f ${REALIMAGE} ${IMAGE}
 
 ecoffrdsetroot:	${TOP}/ecoffrdsetroot.c
-	${HOSTCC} -o ecoffrdsetroot ${TOP}/ecoffrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o ecoffrdsetroot ${TOP}/ecoffrdsetroot.c
 
 bsd:	${KERNEL}
 	cp ${KERNEL} bsd
 
-do_prep: ${CBIN}
+do_prep:
 	dd if=/dev/zero of=${REALIMAGE} count=${NBLKS}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
 	
 do_mount:
-	newfs ${NEWFSARGS} -s ${NBLKS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV} ${DISKTYPE}
 	mount ${VND_DEV} ${MOUNT_POINT}
  
 do_umount:
@@ -53,10 +89,9 @@ do_umount:
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND} && cat /*bin/* > /dev/null
+	vnconfig -u ${VND}
+	cat /*bin/* > /dev/null
 
 unconfig:
 	-umount ${MOUNT_POINT}
 	-vnconfig -u ${VND} && cat /*bin/* > /dev/null
-
-.PRECIOUS:	${IMAGE}