Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/bebox/floppies Cleanup floppy directory.
details: https://anonhg.NetBSD.org/src/rev/544f9509cdf1
branches: trunk
changeset: 758080:544f9509cdf1
user: kiyohara <kiyohara%NetBSD.org@localhost>
date: Sun Oct 17 11:19:53 2010 +0000
description:
Cleanup floppy directory.
diffstat:
distrib/bebox/floppies/Makefile | 7 +-
distrib/bebox/floppies/Makefile.inc | 3 -
distrib/bebox/floppies/bootfloppy-common/Makefile.inc | 75 +--
distrib/bebox/floppies/bootfloppy-common/list | 4 -
distrib/bebox/floppies/bootfloppy_com0/Makefile | 8 +
distrib/bebox/floppies/bootfloppy_vga/Makefile | 8 +
distrib/bebox/floppies/ramdisk/Makefile | 70 --
distrib/bebox/floppies/ramdisk/Makefile.inc | 54 -
distrib/bebox/floppies/ramdisk/dot.profile | 68 --
distrib/bebox/floppies/ramdisk/install.tmpl | 505 ------------------
distrib/bebox/floppies/ramdisk/list | 83 --
distrib/bebox/floppies/ramdisk/mtree.conf | 82 --
distrib/bebox/floppies/ramdisk/ramdiskbin.conf | 36 -
distrib/bebox/floppies/ramdisk/start.tmpl | 49 -
distrib/bebox/floppies/ramdisk/upgrade.tmpl | 244 --------
15 files changed, 38 insertions(+), 1258 deletions(-)
diffs (truncated from 1368 to 300 lines):
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/Makefile
--- a/distrib/bebox/floppies/Makefile Sun Oct 17 11:05:18 2010 +0000
+++ b/distrib/bebox/floppies/Makefile Sun Oct 17 11:19:53 2010 +0000
@@ -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>
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/Makefile.inc
--- a/distrib/bebox/floppies/Makefile.inc Sun Oct 17 11:05:18 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.4 2002/04/26 15:25:33 lukem Exp $
-
-.include "../../Makefile.inc"
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Sun Oct 17 11:05:18 2010 +0000
+++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Sun Oct 17 11:19:53 2010 +0000
@@ -1,67 +1,26 @@
-# $NetBSD: Makefile.inc,v 1.12 2009/09/18 09:24:59 abs Exp $
-
-# TOP is assumed to be defined by Makefile including this one.
+# $NetBSD: Makefile.inc,v 1.13 2010/10/17 11:19:53 kiyohara Exp $
-COMMONDIR= ${TOP}/bootfloppy-common
-
-.include <bsd.kernobj.mk>
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-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
+# Required variables:
+# IMAGE
-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
+MDEC?= ${DESTDIR}/usr/mdec
+BOOTLOADER?= ${MDEC}/boot
-CLEANFILES+= netbsd.ram.gz
+${IMAGE}:
+ ${TOOL_POWERPCMKBOOTIMAGE} -I -m ${MACHINE} -b ${BOOTLOADER} ${.TARGET}
-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}
+KFILES= ${IMAGE}
+
+CLEANFILES+= ${KFILES}
+
-unconfig:
- -umount -f ${MOUNT_POINT}
- -vnconfig -u ${VND_DEV}
- -/bin/rm -f ${IMAGE}
+realall: ${KFILES}
-netbsd.ram.gz: ${KERN} ${RAMDISK}
- cp ${KERN} netbsd.tmp
- ${TOOL_MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
- gzip -9nf netbsd.tmp
- mv netbsd.tmp.gz ${.TARGET}
+release: check_RELEASEDIR .WAIT ${KFILES}
+ ${RELEASE_INSTALL} ${KFILES} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy
-clean cleandir:
- /bin/rm -f *.core ${IMAGE} ${CLEANFILES}
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/bootfloppy-common/list
--- a/distrib/bebox/floppies/bootfloppy-common/list Sun Oct 17 11:05:18 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: list,v 1.1 1998/11/19 08:58:03 sakamoto Exp $
-
-# copy the kernel
-COPY ${OBJDIR}/netbsd.ram.gz netbsd.gz
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/bootfloppy_com0/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/bebox/floppies/bootfloppy_com0/Makefile Sun Oct 17 11:19:53 2010 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/10/17 11:26:12 kiyohara Exp $
+
+IMAGE= boot_com0.fs
+BOOTLOADER= ${MDEC}/boot_com0
+
+.include <bsd.own.mk>
+
+.include "../bootfloppy-common/Makefile.inc"
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/bootfloppy_vga/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/bebox/floppies/bootfloppy_vga/Makefile Sun Oct 17 11:19:53 2010 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/10/17 11:26:12 kiyohara Exp $
+
+IMAGE= boot_vga.fs
+BOOTLOADER= ${MDEC}/boot_vga
+
+.include <bsd.own.mk>
+
+.include "../bootfloppy-common/Makefile.inc"
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/ramdisk/Makefile
--- a/distrib/bebox/floppies/ramdisk/Makefile Sun Oct 17 11:05:18 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2009/09/18 09:24:59 abs Exp $
-
-TOP= ${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-IMAGE= ramdisk.fs
-
-AUXTARGETS= install.sh upgrade.sh start.sh
-AUXCLEAN= ${AUXTARGETS}
-
-CBIN= ramdiskbin
-
-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}d
-VND_CRDEV= /dev/r${VND}d
-IMAGE?= xxx.fs
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= list
-CRUNCHCONF= ${CBIN}.conf
-MTREECONF= mtree.conf
-
-DISKTYPE= floppy3
-
-install.sh: install.tmpl
- ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET}
-
-upgrade.sh: upgrade.tmpl
- ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET}
-
-start.sh: start.tmpl
- ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET}
-
-all: ${AUXTARGETS} ${CBIN}
- dd if=/dev/zero of=${IMAGE} count=3074
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -rw ${VND_CDEV} ${DISKTYPE}
- newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
- mount ${VND_DEV} ${MOUNT_POINT}
- ${TOOL_MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
- 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}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- ${TOOL_CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
- ${MAKE} -f ${CBIN}.mk all
-
-clean cleandir:
- /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/ramdisk/Makefile.inc
--- a/distrib/bebox/floppies/ramdisk/Makefile.inc Sun Oct 17 11:05:18 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/09/18 09:24:59 abs Exp $
-
-# TOP is assumed to be defined by Makefile including this one.
-
-CBIN= ramdiskbin
-COMMONDIR= ${TOP}/ramdisk-common
-
-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
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= ${COMMONDIR}/list ${.CURDIR}/list
-CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf
-MTREECONF= ${COMMONDIR}/mtree.conf
-
-DISKTYPE= floppy3
-
-all: ${AUXTARGETS} ${CBIN}
- dd if=/dev/zero of=${IMAGE} count=2880
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -rw ${VND_CDEV} ${DISKTYPE}
- newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
- mount ${VND_DEV} ${MOUNT_POINT}
- ${TOOL_MTREE} -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
- 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}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- ${TOOL_CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
- ${MAKE} -f ${CBIN}.mk all
-
-clean cleandir:
- /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff -r 1302f4130aea -r 544f9509cdf1 distrib/bebox/floppies/ramdisk/dot.profile
--- a/distrib/bebox/floppies/ramdisk/dot.profile Sun Oct 17 11:05:18 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-# $NetBSD: dot.profile,v 1.8 2003/07/26 17:06:35 salo Exp $
-#
-# Copyright (c) 1997 Perry E. Metzger
-# Copyright (c) 1994 Christopher G. Demetriou
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed for the
-# NetBSD Project. See http://www.NetBSD.org/ for
-# information about NetBSD.
-# 4. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
Home |
Main Index |
Thread Index |
Old Index