Module Name:    src
Committed By:   kiyohara
Date:           Sun Oct 17 11:19:53 UTC 2010

Modified Files:
        src/distrib/bebox/floppies: Makefile
        src/distrib/bebox/floppies/bootfloppy-common: Makefile.inc
Removed Files:
        src/distrib/bebox/floppies: Makefile.inc
        src/distrib/bebox/floppies/bootfloppy-common: list

Log Message:
Cleanup floppy directory.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/bebox/floppies/Makefile
cvs rdiff -u -r1.4 -r0 src/distrib/bebox/floppies/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 \
    src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/distrib/bebox/floppies/bootfloppy-common/list

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/bebox/floppies/Makefile
diff -u src/distrib/bebox/floppies/Makefile:1.1 src/distrib/bebox/floppies/Makefile:1.2
--- src/distrib/bebox/floppies/Makefile:1.1	Thu Nov 19 08:58:02 1998
+++ src/distrib/bebox/floppies/Makefile	Sun Oct 17 11:19:53 2010
@@ -1,5 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 1998/11/19 08:58:02 sakamoto Exp $
+#	$NetBSD: Makefile,v 1.2 2010/10/17 11:19:53 kiyohara Exp $
 
-SUBDIR=	ramdisk bootfloppy
+SUBDIR=		kernel-ramdisk .WAIT \
+		bootfloppy bootfloppy_vga bootfloppy_com0
+
+TARGETS+=	release
 
 .include <bsd.subdir.mk>

Index: src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
diff -u src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.12 src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.13
--- src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc:1.12	Fri Sep 18 09:24:59 2009
+++ src/distrib/bebox/floppies/bootfloppy-common/Makefile.inc	Sun Oct 17 11:19:53 2010
@@ -1,67 +1,26 @@
-#	$NetBSD: Makefile.inc,v 1.12 2009/09/18 09:24:59 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2010/10/17 11:19:53 kiyohara Exp $
 
-# TOP is assumed to be defined by Makefile including this one.
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
-COMMONDIR=	${TOP}/bootfloppy-common
+# Required variables:
+#	IMAGE
+
+MDEC?=		${DESTDIR}/usr/mdec
+BOOTLOADER?=	${MDEC}/boot
+
+${IMAGE}:
+	${TOOL_POWERPCMKBOOTIMAGE} -I -m ${MACHINE} -b ${BOOTLOADER} ${.TARGET}
+
+KFILES=	${IMAGE}
+
+CLEANFILES+=	${KFILES}
 
-.include <bsd.kernobj.mk>
-.include <bsd.own.mk>
 
-MOUNT_POINT?=	/mnt
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CDEV=	/dev/${VND}d
-VND_CRDEV=	/dev/r${VND}d
-IMAGE?=		xxx.fs
-KERN?=		netbsd-xxx
-MDEC=		${DESTDIR}/usr/mdec
-
-LISTS=		${COMMONDIR}/list
-
-RAMDISKDIR!=	cd $(.CURDIR)/../ramdisk && ${PRINTOBJDIR}
-RAMDISK=	${RAMDISKDIR}/ramdisk.fs
-
-DISKTYPE?=	floppy3
-DISKSIZE?=	2880
-
-# Some reasonable values for the -i parameter to newfs are:
-#
-#   6144	1147k, 189 inodes free
-#  16384	1159k,  93 inodes free
-# 204800	1167k,  29 inodes free
-INO_BYTES?=	204800
-
-CLEANFILES+=	netbsd.ram.gz
-
-all:	netbsd.ram.gz
-	dd if=/dev/zero of=${IMAGE} count=${DISKSIZE}
-	vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
-	disklabel -rw ${VND_CDEV} ${DISKTYPE}
-	newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
-	    ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND_CDEV}
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND_DEV}
-	-/bin/rm -f ${IMAGE}
-
-netbsd.ram.gz: ${KERN} ${RAMDISK}
-	cp ${KERN} netbsd.tmp
-	${TOOL_MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
-	gzip -9nf netbsd.tmp
-	mv netbsd.tmp.gz ${.TARGET}
+realall: ${KFILES}
 
-clean cleandir:
-	/bin/rm -f *.core ${IMAGE} ${CLEANFILES}
+release: check_RELEASEDIR .WAIT ${KFILES}
+	${RELEASE_INSTALL} ${KFILES} \
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy
 
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>

Reply via email to