Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/distrib/x68k/floppies Pullup from the trunk; approved b...
details: https://anonhg.NetBSD.org/src/rev/52918995aba7
branches: netbsd-1-5
changeset: 489462:52918995aba7
user: minoura <minoura%NetBSD.org@localhost>
date: Thu Sep 14 14:28:07 2000 +0000
description:
Pullup from the trunk; approved by thorpej.
> From: Minoura Makoto <minoura%netbsd.org@localhost>
> Subject: CVS commit: basesrc
> To: source-changes%netbsd.org@localhost
> Date: Tue, 12 Sep 2000 19:42:52 +0300 (EEST)
> Reply-To: minoura%netbsd.org@localhost
>
>
> Module Name: basesrc
> Committed By: minoura
> Date: Tue Sep 12 16:42:52 UTC 2000
>
> Modified Files:
> basesrc/distrib/x68k/floppies/ramdisk: Makefile list
> basesrc/distrib/x68k/floppies/ramdisk.sysinst: Makefile list
> Added Files:
> basesrc/distrib/x68k/floppies/ramdisk-common: Makefile.inc
> disktab.preinstall installboot.sh termcap.vt
> Removed Files:
> basesrc/distrib/x68k/floppies/ramdisk: Makefile.inc disktab.preinstall
> termcap.vt
> basesrc/distrib/x68k/floppies/ramdisk.sysinst: disktab.preinstall
> installboot.sh termcap.vt
>
> Log Message:
> Pull common files into newly created ramdisk-common directory.
>
>
> To generate a diff of this commit:
> cvs rdiff -r1.17 -r1.18 basesrc/distrib/x68k/floppies/ramdisk/Makefile
> cvs rdiff -r1.9 -r0 basesrc/distrib/x68k/floppies/ramdisk/Makefile.inc
> cvs rdiff -r1.1 -r0 basesrc/distrib/x68k/floppies/ramdisk/disktab.preinstall \
> basesrc/distrib/x68k/floppies/ramdisk/termcap.vt
> cvs rdiff -r1.12 -r1.13 basesrc/distrib/x68k/floppies/ramdisk/list
> cvs rdiff -r0 -r1.1 basesrc/distrib/x68k/floppies/ramdisk-common/Makefile.inc \
> basesrc/distrib/x68k/floppies/ramdisk-common/disktab.preinstall \
> basesrc/distrib/x68k/floppies/ramdisk-common/installboot.sh \
> basesrc/distrib/x68k/floppies/ramdisk-common/termcap.vt
> cvs rdiff -r1.9 -r1.10 basesrc/distrib/x68k/floppies/ramdisk.sysinst/Makefile
> cvs rdiff -r1.1 -r0 \
> basesrc/distrib/x68k/floppies/ramdisk.sysinst/disktab.preinstall \
> basesrc/distrib/x68k/floppies/ramdisk.sysinst/termcap.vt
> cvs rdiff -r1.5 -r0 \
> basesrc/distrib/x68k/floppies/ramdisk.sysinst/installboot.sh
> cvs rdiff -r1.8 -r1.9 basesrc/distrib/x68k/floppies/ramdisk.sysinst/list
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
diffstat:
distrib/x68k/floppies/ramdisk-common/Makefile.inc | 71 ++++++++++++++
distrib/x68k/floppies/ramdisk-common/disktab.preinstall | 31 ++++++
distrib/x68k/floppies/ramdisk-common/installboot.sh | 30 ++++++
distrib/x68k/floppies/ramdisk-common/termcap.vt | 57 +++++++++++
distrib/x68k/floppies/ramdisk.sysinst/Makefile | 78 ++-------------
distrib/x68k/floppies/ramdisk.sysinst/disktab.preinstall | 31 ------
distrib/x68k/floppies/ramdisk.sysinst/installboot.sh | 30 ------
distrib/x68k/floppies/ramdisk.sysinst/list | 8 +-
distrib/x68k/floppies/ramdisk.sysinst/termcap.vt | 57 -----------
distrib/x68k/floppies/ramdisk/Makefile | 74 ++------------
distrib/x68k/floppies/ramdisk/Makefile.inc | 54 -----------
distrib/x68k/floppies/ramdisk/disktab.preinstall | 31 ------
distrib/x68k/floppies/ramdisk/list | 8 +-
distrib/x68k/floppies/ramdisk/termcap.vt | 67 -------------
14 files changed, 220 insertions(+), 407 deletions(-)
diffs (truncated from 759 to 300 lines):
diff -r 96661af6ae0e -r 52918995aba7 distrib/x68k/floppies/ramdisk-common/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/ramdisk-common/Makefile.inc Thu Sep 14 14:28:07 2000 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile.inc,v 1.1.2.2 2000/09/14 14:28:08 minoura Exp $
+
+.include "${TOP}/Makefile.inc"
+
+WARNS=1
+
+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
+IMAGE?= xxx.fs
+MDEC= ${DESTDIR}/usr/mdec
+
+LISTS= list
+CRUNCHCONF= ${CBIN}.conf
+MTREE= mtree.conf
+
+realall: ${IMAGE}
+
+RAMDISKSIZE!= expr ${RAMDISKSPT} \* ${RAMDISKCYLS} \* ${RAMDISKHEADS}
+RAMDISKGEOM= 512/${RAMDISKSPT}/${RAMDISKHEADS}/${RAMDISKCYLS}
+
+${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+ dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
+ vnconfig -v -c ${VND_CDEV} ${IMAGE} ${RAMDISKGEOM}
+ newfs -B be -m 0 -o space -i ${RAMDISKBPI} -c ${RAMDISKCPG} ${VND_RDEV}
+ mount ${VND_DEV} ${MOUNT_POINT}
+ mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
+ TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} COMMONDIR=${TOP}/ramdisk-common \
+ TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${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}
+ crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
+
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+ ${MAKE} -f ${CBIN}.mk all
+
+# Use size-reduced libhack.
+${CBIN}: libhack.o
+
+HACKSRC=${TOP}/../../utils/libhack
+.include "${HACKSRC}/Makefile.inc"
+
+# turn off small gethostby* temporarily
+HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o localeconv.o perror.o setlocale.o strerror.o strsignal.o utmp.o yplib.o
+DBG= -Os
+
+# Used in building bootfloppy
+echoimage:
+ @echo ${.OBJDIR}/${IMAGE}
+
+depend:
+
+release:
+
+clean cleandir distclean:
+ /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
diff -r 96661af6ae0e -r 52918995aba7 distrib/x68k/floppies/ramdisk-common/disktab.preinstall
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/ramdisk-common/disktab.preinstall Thu Sep 14 14:28:07 2000 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: disktab.preinstall,v 1.1.2.2 2000/09/14 14:28:08 minoura Exp $
+#
+# Disk geometry and partition layout tables.
+# Key:
+# dt controller type
+# ty type of disk (fixed, removeable, simulated)
+# d[0-4] drive-type-dependent parameters
+# ns #sectors/track
+# nt #tracks/cylinder
+# nc #cylinders/disk
+# sc #sectors/cylinder, nc*nt default
+# su #sectors/unit, sc*nc default
+# se sector size, DEV_BSIZE default
+# rm rpm, 3600 default
+# sf supports bad144-style bad sector forwarding
+# sk sector skew per track, default 0
+# cs sector skew per cylinder, default 0
+# hs headswitch time, default 0
+# ts one-cylinder seek time, default 0
+# il sector interleave (n:1), 1 default
+# bs boot block size, default BBSIZE
+# sb superblock size, default SBSIZE
+# o[a-h] partition offsets in sectors
+# p[a-h] partition sizes in sectors
+# b[a-h] partition block sizes in bytes
+# f[a-h] partition fragment sizes in bytes
+# t[a-h] partition types (filesystem, swap, etc)
+#
+# All partition sizes reserve space for bad sector tables.
+# (5 cylinders needed for maintenance + replacement sectors)
+#
diff -r 96661af6ae0e -r 52918995aba7 distrib/x68k/floppies/ramdisk-common/installboot.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/ramdisk-common/installboot.sh Thu Sep 14 14:28:07 2000 +0000
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# size-reduced installboot for the install floppy.
+# supports only SCSI disks.
+#
+# requires /bin/sh /bin/dd (x_dd) /bin/mkdir /bin/rm /bin/test
+# /sbin/disklabel
+#
+# $NetBSD: installboot.sh,v 1.1.2.2 2000/09/14 14:28:09 minoura Exp $
+#
+#
+# originally from:
+# do like as disklabel -B
+#
+# usage: installboot <boot_file> <boot_device(raw)>
+#
+# requires /bin/sh /bin/dd /bin/mkdir /bin/rm /bin/test
+# /sbin/disklabel /usr/bin/sed /usr/bin/od
+#
+# Public domain --written by Yasha (ITOH Yasufumi)
+#
+# NetBSD: installboot.sh,v 1.1 1998/09/01 20:02:34 itohy Exp
+
+PATH=/bin:/sbin:/usr/bin
+
+echo "$0: THIS VERSION OF $0 DOES NO ERROR CHECK!"
+echo "$0: Sleeping for 5 seconds; press ^C to abort."
+echo "===> cat $1 /dev/zero | dd ibs=1 count=8192 obs=512 of=$2"
+sleep 5
+cat $1 /dev/zero | dd ibs=1 count=8192 obs=512 of=$2
diff -r 96661af6ae0e -r 52918995aba7 distrib/x68k/floppies/ramdisk-common/termcap.vt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/ramdisk-common/termcap.vt Thu Sep 14 14:28:07 2000 +0000
@@ -0,0 +1,57 @@
+#
+# $NetBSD: termcap.vt,v 1.1.2.2 2000/09/14 14:28:10 minoura Exp $
+#
+# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
+# 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 by the University of
+# California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# @(#)termcap.src 5.109 (Berkeley) 3/8/93
+#
+vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
+ :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+ :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:ct=\E[3g:dc=\E[P:dl=\E[M:\
+ :ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
+ :k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
+ :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
+ :if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
+ :tc=vt100:
+vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
+ :bl=^G:cr=^M:it#8:\
+ :do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
+ :le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
+ :ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
+ :md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
+ :if=/usr/share/tabset/vt100:\
+ :rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
+ :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
+ :ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
+ :sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
+x68k|x68k-ite|NetBSD/x68k ITE:\
+ :co#96:li#32:%1=\E[28~:kC=\E[9~:tc=vt220:
diff -r 96661af6ae0e -r 52918995aba7 distrib/x68k/floppies/ramdisk.sysinst/Makefile
--- a/distrib/x68k/floppies/ramdisk.sysinst/Makefile Thu Sep 14 14:15:23 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/Makefile Thu Sep 14 14:28:07 2000 +0000
@@ -1,50 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2000/06/18 10:33:19 minoura Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2000/09/14 14:28:10 minoura Exp $
TOP= ${.CURDIR}/..
-WARNS=1
+COMMONDIR= ${TOP}/ramdisk-common
-.include "${TOP}/Makefile.inc"
IMAGE= ramdisk.fs
-AUXDEPENDS= dot.profile dot.hdprofile disktab.preinstall \
- termcap.vt
+AUXTARGETS= passwd
+AUXDEPENDS= ${AUXTARGETS} dot.profile dot.hdprofile \
+ ${COMMONDIR}/termcap.vt ${COMMONDIR}/disktab.preinstall \
+ ${COMMONDIR}/installboot.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}c
-VND_CRDEV= /dev/r${VND}c
-IMAGE?= xxx.fs
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= list
-CRUNCHCONF= ${CBIN}.conf
-MTREE= mtree.conf
-
RAMDISKSPT= 36
RAMDISKCYLS= 80
-RAMDISKSIZE!= expr ${RAMDISKSPC} \* ${RAMDISKCYLS} \* 2
-
-realall: ${IMAGE}
-
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS} passwd
- dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
- vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/${RAMDISKTPC}/2/${RAMDISKCYLS}
- newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV}
- mount ${VND_DEV} ${MOUNT_POINT}
- mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
- TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
- @echo ""
- @df -i ${MOUNT_POINT}
- @echo ""
- umount ${MOUNT_POINT}
- vnconfig -u ${VND_CDEV}
+RAMDISKCPG= 48
+RAMDISKBPI= 4096
passwd:
-/bin/mkdir ${.OBJDIR}/etc
@@ -52,37 +24,7 @@
pwd_mkdb -p -d ${.OBJDIR} ${.OBJDIR}/etc/master.passwd
/bin/cp -pf ${.OBJDIR}/etc/passwd ${.OBJDIR}
-unconfig:
- -umount -f ${MOUNT_POINT}
- -vnconfig -u ${VND_DEV}
- -/bin/rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
- make -f ${CBIN}.mk all
-
-# Use size-reduced libhack.
-${CBIN}: libhack.o
-
-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# turn off small gethostby* temporarily
-HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o localeconv.o perror.o setlocale.o strerror.o strsignal.o utmp.o yplib.o
-DBG= -Os
-
-# Used in building bootfloppy
-echoimage:
- @echo ${.OBJDIR}/${IMAGE}
-
-depend:
-
-release:
Home |
Main Index |
Thread Index |
Old Index