From: deraadt Date: Thu, 14 Dec 1995 06:59:45 +0000 (+0000) Subject: update from netbsd X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dcbe87ba9b71cb0a2c7f645b98fcc0a9b2b3d781;p=openbsd update from netbsd --- diff --git a/distrib/alpha/rz25dist/Makefile b/distrib/alpha/rz25dist/Makefile index 844b1c87fc0..9969e506669 100644 --- a/distrib/alpha/rz25dist/Makefile +++ b/distrib/alpha/rz25dist/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.7 1995/10/10 01:19:16 cgd Exp $ +# $NetBSD: Makefile,v 1.11 1995/12/09 05:27:22 cgd Exp $ # Make a distribution for the alpha, on a spare disk. # This creates a large, gzipped disk image in ${.OBJDIR} +TARGETS= bin.tar.gz etc.tar.gz x11.tar.gz rz25-image.gz + .if !defined(DESTDIR) || !defined(DESTDISK) all: @echo both 'DESTDIR' and 'DESTDISK' must be defined. @@ -12,14 +14,13 @@ all: SECPERCYL= 558 CYLS= 1476 -all: bin.tar.gz etc.tar.gz rz25-image.gz +all: ${TARGETS} mount-fs: disklabel -W ${DESTDISK} -dd if=/dev/zero of=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \ count=${CYLS} - disklabel -w -r -B -b /usr/mdec/sdboot -s /usr/mdec/bootsd \ - ${DESTDISK} rz25 + disklabel -w -r ${DESTDISK} rz25 disklabel -W ${DESTDISK} newfs -O /dev/r${DESTDISK}a newfs -O /dev/r${DESTDISK}d @@ -31,10 +32,11 @@ build-fs: cd ${.CURDIR}/../../../etc && make distribution cd ${.CURDIR}/../../../cygnus && \ make prefix=${DESTDIR}/usr/local install + cd ${.CURDIR}/../../../xc && make install install.man cp ${.CURDIR}/../../../sys/arch/alpha/compile/GENERIC/netbsd ${DESTDIR} ln -s gcc ${DESTDIR}/usr/local/bin/cc ln -s \ - ../local/lib/gcc-lib/alpha-unknown-netbsd1.0A/2.7-95q4/cpp \ + ../local/lib/gcc-lib/alpha-unknown-netbsd1.0A./2.7-95q4/cpp \ ${DESTDIR}/usr/libexec ln -s ../local/bin/ar ${DESTDIR}/usr/bin ln -s ../local/bin/as ${DESTDIR}/usr/bin @@ -46,6 +48,9 @@ build-fs: ln -s ../local/bin/size ${DESTDIR}/usr/bin ln -s ../local/bin/strip ${DESTDIR}/usr/bin cp -p ${DESTDIR}/usr/mdec/boot ${DESTDIR}/ + sync; sleep 1; sync; sleep 1 + ${DESTDIR}/usr/mdec/installboot -v ${DESTDIR}/boot \ + ${DESTDIR}/usr/mdec/bootxx /dev/r${DESTDISK}c unmount-fs: umount ${DESTDIR}/usr ${DESTDIR} @@ -58,19 +63,25 @@ rz25-image.gz: mount-fs build-fs unmount-fs bin.tar.gz: mount-fs build-fs /bin/rm -f $@ - (cd ${DESTDIR} ; find . | grep -v '^./etc' | pax -w -d | gzip -9) > $@ + (cd ${DESTDIR} ; find . | grep -v '^./etc' | \ + grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \ + grep -v '^./boot' | pax -w -d | gzip -9) > $@ etc.tar.gz: mount-fs build-fs /bin/rm -f $@ (cd ${DESTDIR} ; find ./etc | pax -w -d | gzip -9) > $@ +x11.tar.gz: mount-fs build-fs + /bin/rm -f $@ + (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | gzip -9) > $@ + .endif _SUBDIRUSE: # clean dependencies in case somebody decides to shortcut the build. clean: - /bin/rm -f bin.tar.gz etc.tar.gz rz25-image.gz + /bin/rm -f ${TARGETS} /bin/rm -f mount-fs build-fs unmount-fs .include diff --git a/distrib/amiga/floppies/inst-common/Makefile.inc b/distrib/amiga/floppies/inst-common/Makefile.inc index 028a8c33d16..8bb5b3b600b 100644 --- a/distrib/amiga/floppies/inst-common/Makefile.inc +++ b/distrib/amiga/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.2 1995/11/28 17:31:49 deraadt Exp $ +# $Id: Makefile.inc,v 1.3 1995/12/14 06:59:50 deraadt Exp $ # TOP is assumed to be defined by Makefile including this one. diff --git a/distrib/amiga/floppies/inst-common/dot.commonutils b/distrib/amiga/floppies/inst-common/dot.commonutils index 544979834f4..77aebaff6c3 100644 --- a/distrib/amiga/floppies/inst-common/dot.commonutils +++ b/distrib/amiga/floppies/inst-common/dot.commonutils @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: dot.commonutils,v 1.2 1995/11/06 21:27:23 deraadt Exp $ +# $Id: dot.commonutils,v 1.3 1995/12/14 06:59:51 deraadt Exp $ # Installation utilites (functions), to get NetBSD installed on # the hard disk. These are meant to be invoked from the shell prompt, diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list index aa499121392..88869c960ea 100644 --- a/distrib/amiga/floppies/inst-common/list +++ b/distrib/amiga/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1995/11/28 17:31:51 deraadt Exp $ +# $Id: list,v 1.3 1995/12/14 06:59:52 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/amiga/floppies/inst/list b/distrib/amiga/floppies/inst/list index 207025f329f..c50c88d1775 100644 --- a/distrib/amiga/floppies/inst/list +++ b/distrib/amiga/floppies/inst/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1995/11/28 17:31:44 deraadt Exp $ +# $Id: list,v 1.3 1995/12/14 06:59:49 deraadt Exp $ # the disktab explanation file COPY disktab.preinstall etc diff --git a/distrib/amiga/floppies/upgr/list b/distrib/amiga/floppies/upgr/list index 6d61990e0cb..deed72b8023 100644 --- a/distrib/amiga/floppies/upgr/list +++ b/distrib/amiga/floppies/upgr/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1995/11/28 17:31:55 deraadt Exp $ +# $Id: list,v 1.3 1995/12/14 06:59:53 deraadt Exp $ # copy the kernel COPY ${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/netbsd netbsd diff --git a/distrib/atari/Makefile.inc b/distrib/atari/Makefile.inc index a5213083891..70d897586e9 100644 --- a/distrib/atari/Makefile.inc +++ b/distrib/atari/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1.1.1.2.1 1995/10/13 21:06:42 leo Exp $ +# $NetBSD: Makefile.inc,v 1.2 1995/11/28 23:57:10 jtc Exp $ # Revision is 1.1 REV= 11 diff --git a/distrib/atari/inst-common/dot.commonutils b/distrib/atari/inst-common/dot.commonutils index 09588224842..5fc02760705 100644 --- a/distrib/atari/inst-common/dot.commonutils +++ b/distrib/atari/inst-common/dot.commonutils @@ -1,5 +1,5 @@ # -# $NetBSD: dot.commonutils,v 1.2.2.1 1995/11/15 22:01:35 leo Exp $ +# $NetBSD: dot.commonutils,v 1.3 1995/11/28 23:57:12 jtc Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. diff --git a/distrib/hp300/miniroot/Makefile.inc b/distrib/hp300/miniroot/Makefile.inc index e13ecd89723..49fab8b07fc 100644 --- a/distrib/hp300/miniroot/Makefile.inc +++ b/distrib/hp300/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1.2.1 1995/11/07 07:31:09 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.2 1995/11/28 23:57:15 jtc Exp $ # Revision is 1.1 REV= 11 diff --git a/distrib/hp300/miniroot/inst-common/instbin.conf b/distrib/hp300/miniroot/inst-common/instbin.conf index ecada0e961d..aca4ed1f3ef 100644 --- a/distrib/hp300/miniroot/inst-common/instbin.conf +++ b/distrib/hp300/miniroot/inst-common/instbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: instbin.conf,v 1.1.2.3 1995/11/14 10:03:13 thorpej Exp $ +# $NetBSD: instbin.conf,v 1.4 1995/11/14 10:12:36 thorpej Exp $ # # instbin.conf - configuration for hp300 miniroot diff --git a/distrib/hp300/miniroot/inst-common/list b/distrib/hp300/miniroot/inst-common/list index 518652674d5..1dbd0911428 100644 --- a/distrib/hp300/miniroot/inst-common/list +++ b/distrib/hp300/miniroot/inst-common/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.1.2.3 1995/11/14 10:03:15 thorpej Exp $ +# $NetBSD: list,v 1.4 1995/11/14 10:12:38 thorpej Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/hp300/miniroot/inst-common/mtree.conf b/distrib/hp300/miniroot/inst-common/mtree.conf index 9a294056ed0..0ed90f9af58 100644 --- a/distrib/hp300/miniroot/inst-common/mtree.conf +++ b/distrib/hp300/miniroot/inst-common/mtree.conf @@ -1,4 +1,4 @@ -# $NetBSD: mtree.conf,v 1.1.2.1 1995/11/07 07:22:07 thorpej Exp $ +# $NetBSD: mtree.conf,v 1.3 1995/11/14 10:12:39 thorpej Exp $ /set type=dir uname=root gname=wheel mode=0755 # . diff --git a/distrib/hp300/miniroot/inst/dot.profile b/distrib/hp300/miniroot/inst/dot.profile index bc810c7bae7..6b89baff4de 100644 --- a/distrib/hp300/miniroot/inst/dot.profile +++ b/distrib/hp300/miniroot/inst/dot.profile @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.1.2.1 1995/11/11 06:16:44 thorpej Exp $ +# $NetBSD: dot.profile,v 1.2 1995/11/11 06:24:47 thorpej Exp $ # # Copyright (c) 1995 Jason R. Thorpe # Copyright (c) 1994 Christopher G. Demetriou diff --git a/distrib/hp300/miniroot/inst/install.sh b/distrib/hp300/miniroot/inst/install.sh index 00ddd77fa32..01feca07bcc 100644 --- a/distrib/hp300/miniroot/inst/install.sh +++ b/distrib/hp300/miniroot/inst/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.1.2.7 1995/11/16 07:30:54 thorpej Exp $ +# $NetBSD: install.sh,v 1.6 1995/11/28 23:57:17 jtc Exp $ # # Copyright (c) 1995 Jason R. Thorpe. # All rights reserved. @@ -35,7 +35,7 @@ # In a perfect world, this would be a nice C program, with a reasonable # user interface. -VERSION=1.1 +VERSION=1.1A export VERSION # XXX needed in subshell ROOTDISK="" # filled in below FILESYSTEMS="/tmp/filesystems" # used thoughout diff --git a/distrib/hp300/miniroot/inst/list b/distrib/hp300/miniroot/inst/list index 063a39737a7..9f74095fa7e 100644 --- a/distrib/hp300/miniroot/inst/list +++ b/distrib/hp300/miniroot/inst/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.1.2.1 1995/11/14 01:36:10 thorpej Exp $ +# $NetBSD: list,v 1.2 1995/11/14 01:40:42 thorpej Exp $ # copy the kernel COPY ${CURDIR}/../../../../sys/arch/hp300/compile/GENERIC/netbsd netbsd diff --git a/distrib/hp300/miniroot/inst/upgrade.sh b/distrib/hp300/miniroot/inst/upgrade.sh index f429c1483bf..dba084cf988 100644 --- a/distrib/hp300/miniroot/inst/upgrade.sh +++ b/distrib/hp300/miniroot/inst/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.1.2.1 1995/11/14 09:59:58 thorpej Exp $ +# $NetBSD: upgrade.sh,v 1.2 1995/11/28 23:57:19 jtc Exp $ # # Copyright (c) 1995 Jason R. Thorpe. # All rights reserved. diff --git a/distrib/i386/floppies/inst-common/dot.commonutils b/distrib/i386/floppies/inst-common/dot.commonutils index 9839c256d2b..38cee5bb50f 100644 --- a/distrib/i386/floppies/inst-common/dot.commonutils +++ b/distrib/i386/floppies/inst-common/dot.commonutils @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: dot.commonutils,v 1.2 1995/11/06 21:27:38 deraadt Exp $ +# $Id: dot.commonutils,v 1.3 1995/12/14 07:00:12 deraadt Exp $ # Installation utilites (functions), to get NetBSD installed on # the hard disk. These are meant to be invoked from the shell prompt, diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf index cdda94ccd5e..18d14cab185 100644 --- a/distrib/i386/floppies/inst-common/instbin.conf +++ b/distrib/i386/floppies/inst-common/instbin.conf @@ -1,6 +1,6 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.2 1995/11/23 15:58:00 deraadt Exp $ +# $Id: instbin.conf,v 1.3 1995/12/14 07:00:12 deraadt Exp $ # srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list index b842a11a07b..87c3da499d7 100644 --- a/distrib/i386/floppies/inst-common/list +++ b/distrib/i386/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1995/11/23 15:58:01 deraadt Exp $ +# $Id: list,v 1.3 1995/12/14 07:00:13 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/i386/floppies/inst-common/mtree.conf b/distrib/i386/floppies/inst-common/mtree.conf index 1fdf6e4ce86..2274945d541 100644 --- a/distrib/i386/floppies/inst-common/mtree.conf +++ b/distrib/i386/floppies/inst-common/mtree.conf @@ -1,4 +1,4 @@ -# $Id: mtree.conf,v 1.2 1995/11/23 15:58:02 deraadt Exp $ +# $Id: mtree.conf,v 1.3 1995/12/14 07:00:13 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . diff --git a/distrib/i386/floppies/inst/dot.hdprofile b/distrib/i386/floppies/inst/dot.hdprofile index 3bb1bee7907..77b57a377ee 100644 --- a/distrib/i386/floppies/inst/dot.hdprofile +++ b/distrib/i386/floppies/inst/dot.hdprofile @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: dot.hdprofile,v 1.2 1995/11/23 15:57:57 deraadt Exp $ +# $Id: dot.hdprofile,v 1.3 1995/12/14 07:00:09 deraadt Exp $ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH diff --git a/distrib/i386/floppies/inst/dot.profile b/distrib/i386/floppies/inst/dot.profile index ff168b23cd8..185c09a8254 100644 --- a/distrib/i386/floppies/inst/dot.profile +++ b/distrib/i386/floppies/inst/dot.profile @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: dot.profile,v 1.2 1995/11/23 15:57:58 deraadt Exp $ +# $Id: dot.profile,v 1.3 1995/12/14 07:00:10 deraadt Exp $ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh index d82f84f21e4..2f2a30bc51c 100644 --- a/distrib/i386/floppies/inst/install.sh +++ b/distrib/i386/floppies/inst/install.sh @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: install.sh,v 1.3 1995/11/23 15:57:59 deraadt Exp $ +# $Id: install.sh,v 1.4 1995/12/14 07:00:10 deraadt Exp $ # NetBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable diff --git a/distrib/i386/floppies/upgr/Makefile b/distrib/i386/floppies/upgr/Makefile index c5b9267498e..5d65dfba77a 100644 --- a/distrib/i386/floppies/upgr/Makefile +++ b/distrib/i386/floppies/upgr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/11/06 21:27:41 deraadt Exp $ +# $Id: Makefile,v 1.3 1995/12/14 07:00:15 deraadt Exp $ TOP= ${.CURDIR}/.. diff --git a/distrib/i386/floppies/upgr/upgrade.sh b/distrib/i386/floppies/upgr/upgrade.sh index 0183b9c7f6c..2db8fbd6d3a 100644 --- a/distrib/i386/floppies/upgr/upgrade.sh +++ b/distrib/i386/floppies/upgr/upgrade.sh @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: upgrade.sh,v 1.2 1995/11/06 21:27:47 deraadt Exp $ +# $Id: upgrade.sh,v 1.3 1995/12/14 07:00:15 deraadt Exp $ # NetBSD upgrade script. # In a perfect world, this would be a nice C program, with a reasonable diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install index 32da106be2a..883db19b6a4 100644 --- a/distrib/notes/amiga/install +++ b/distrib/notes/amiga/install @@ -102,7 +102,7 @@ begin again from scratch. type: mkdir /mnt/ados - mount_ados /dev/sd0d /mnt/ados + mount_ados -o ro /dev/sd0d /mnt/ados You can use `disklabel sd0' to find out what types of partitions are on the disk `sd0'. diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer index 602b2bb18e1..de0edd3f1c1 100644 --- a/distrib/notes/amiga/xfer +++ b/distrib/notes/amiga/xfer @@ -5,28 +5,11 @@ Installation is supported from several media types, including: FTP NetBSD partitions, if doing an upgrade. ->>> Transfering install/upgrade file system image to swap partition -No matter what you do, however, you'll need to have one disk handy, -on which you will put the install floppy image. - -All the images are available from the directory "amiga/floppies", ->>> ^^^^^^^^ -under the root of the NetBSD tree at your favorite archive site. - -If you are using NetBSD/amiga to make the floppies, you should use -the command dd(1) to write the raw floppy images (.fs files) to -the disk. To write onto fd0 use: - - dd if=inst-11.fs of=/dev/rfd0a bs=11b - -If you are using AmigaDOS to make the floppies, you should -use the rawwrite utility, provided in the directory -"amiga/utilities" in the distribution. To write the image to -the floppy in df0 use (from cli): - - rawwrite 0 inst-11.fs ->>> fix above to document file system transfer to swap paritition ->>> using xstreamtodev +The install or upgrade miniroot filesystem needs to be transferred +to the NetBSD swap partition. This can be done from AmigaDOS in +the case of a new install or upgrade, or from NetBSD when doing an +upgrade. See the "Preparing your System for NetBSD Installation" +section for details. The steps necessary to prepare the distribution sets for installation depend on which method of installation diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware index 91731a5a0d2..c2601896637 100644 --- a/distrib/notes/hp300/hardware +++ b/distrib/notes/hp300/hardware @@ -11,7 +11,7 @@ Here is a table of recommended HD partition sizes for a full install: Anything else is up to you! NOTE: The hp300 installation procedure utilizes a `miniroot' filesystem -which is placed into the swap area of the disk. The swap area must be +which is placed into the swap area of the disk. The swap are must be at least large enough to hold this miniroot image. The following HP hardware is supported: diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep index 3e137c8aa4e..ada1d72e51f 100644 --- a/distrib/notes/hp300/prep +++ b/distrib/notes/hp300/prep @@ -27,7 +27,7 @@ calculated with the following formula: Controllers are numbered 0, 1, ... starting with the lowest select code. SCSI controllers and HP-IB controllers are counted separately. Therefore, -if you have a system with an internal HP-IB interface at select code 7, +if you had a system with an internal HP-IB interface at select code 7, a fast HP-IB interface at select code 14, and a SCSI interface at select code 16, unit numers might be something like the following: @@ -96,10 +96,10 @@ that it resides in a filesystem what is exported to the client. See the manual pages on your server system if you need more information about exporting filesystems. -You are now ready to load SYS_INST. During the client's self-test cycle, -press the space bar a few times. Shortly, you should see a menu of possible -boot options appear. Select the option corresponding to SYS_INST. SYS_INST -will load and prompt you for a command. +You are now ready to SYS_INST. During the client's self-test cycle, press +the space bar a few times. Shortly, you should see a menu of possible boot +options appear. Select the option corresponding to SYS_INST. SYS_INST will +load and prompt you for a command. If this is a new NetBSD installation, you will need to place a disklabel on the disk. diff --git a/distrib/notes/legal.common b/distrib/notes/legal.common index 5ccc868162b..ed4ba5535e9 100644 --- a/distrib/notes/legal.common +++ b/distrib/notes/legal.common @@ -10,10 +10,10 @@ This product includes software developed by Christian E. Hopps. - This product includes software developed by Paul Kranenburg. - This product includes software developed by John Kohl. + This product includes software developed by Paul Kranenburg. + This product includes software developed by Terrence R. Lambert. This product includes software developed by Frank van der Linden. diff --git a/distrib/notes/pc532/hardware b/distrib/notes/pc532/hardware index 1a338056462..d872fe8c5fa 100644 --- a/distrib/notes/pc532/hardware +++ b/distrib/notes/pc532/hardware @@ -1,4 +1,4 @@ -NetBSD/pc532 1.0 runs on a PC532 computer. It supports a subset of the +NetBSD/pc532 1.1 runs on a PC532 computer. It supports a subset of the "standard" hardware to date. This is defined as: 4 - 32 Megs of memory @@ -7,6 +7,7 @@ NetBSD/pc532 1.0 runs on a PC532 computer. It supports a subset of the Most SCSI disks work (fixed and floppy) A few SCSI tapes work Some SCSI CD-ROM drives work + The Matthias Pfaller Parallel Port. NetBSD/pc532 currently expects the ROM monitor to be the "autoboot monitor" of Oct/Nov 1991. It includes support to set up auto booting diff --git a/distrib/notes/pc532/whatis b/distrib/notes/pc532/whatis index 3399a139941..04d89c1aed6 100644 --- a/distrib/notes/pc532/whatis +++ b/distrib/notes/pc532/whatis @@ -9,6 +9,3 @@ For the pc532 port, there are a few known problems. They include: d) The disk driver is polled, not interrupt driven. - e) kernel support for debugging is not working correctly. - - f) shared libraries are not used yet. \ No newline at end of file diff --git a/distrib/notes/pc532/xfer b/distrib/notes/pc532/xfer index a36b90a8c78..8333a1ce8ac 100644 --- a/distrib/notes/pc532/xfer +++ b/distrib/notes/pc532/xfer @@ -3,7 +3,9 @@ via the console terminal and using the downloading parts of the ROM monitor. As such, usually another computer has the distribution on disk and is connected via a serial line to your pc532's console port. A terminal connected to the attached host computer is used -to access the pc532 console via a terminal program. +to access the pc532 console via a terminal program. The source for +a program called download is part of this distribution. Download +sends data to the ROM monitor over the serial line. You may need to find and read the documentation about the ROM monitor download command and other low level comands. @@ -16,4 +18,4 @@ If you have some operating system already running on your pc532, you can use that OS to get NetBSD/pc532 on a hard disk much easier than with the ROM monitor. (NetBSD/pc532 was developed from Minix/pc532 until it was self hosting. You can run NetBSD and Minix or other OS -off the same disk.) \ No newline at end of file +off the same disk.) diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents index 267dabfa6f7..8964dd047d8 100644 --- a/distrib/notes/sparc/contents +++ b/distrib/notes/sparc/contents @@ -1,8 +1,8 @@ -The sparc-specific portion of the NetBSD 1.1 release is found in the +The sparc-specific portion of the NetBSD RELEASE release is found in the "sparc" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-1.1/sparc/ +.../NetBSD-RELEASE/sparc/ binary/ sparc binary distribution sets; see below. @@ -13,12 +13,12 @@ out as follows: and installation script. The NetBSD/sparc binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the sparc. There are seven binary +comprise the NetBSD RELEASE release for the sparc. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "sparc/binary" -subdirectory of the NetBSD 1.1 distribution tree, and are as follows: +subdirectory of the NetBSD RELEASE distribution tree, and are as follows: - base11 The NetBSD/sparc 1.1 base binary distribution. You + base11 The NetBSD/sparc RELEASE base binary distribution. You MUST install this distribution set. It contains the base NetBSD utilities that are necessary for the system to run and be minimally functional. It @@ -67,7 +67,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows: [ 0.8M gzipped, 3.1M uncompressed ] The sparc security distribution set is named "secr11" and can be found -in the "sparc/security" subdirectory of the NetBSD 1.1 distribution +in the "sparc/security" subdirectory of the NetBSD RELEASE distribution tree. It contains crypt.c (the source file for the DES encryption algorithm) and the binaries which depend on it. It can only be found on those sites which carry the complete NetBSD distribution and that diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware index d425275cfe8..0a360b8b81a 100644 --- a/distrib/notes/sparc/hardware +++ b/distrib/notes/sparc/hardware @@ -1,9 +1,9 @@ -NetBSD/sparc 1.1 runs on the following classes of machines: +NetBSD/sparc RELEASE runs on the following classes of machines: - sun4c (e.g. the SS1, SS1+, SS2, IPC, ELC, IPX, and SLC) - sun4 (e.g. the 4/100, 4/200, and 4/300. note that support for the 4/400 processor is incomplete) -NetBSD/sparc 1.1 does *not* run on these machines (yet): +NetBSD/sparc RELEASE does *not* run on these machines (yet): - sun-4/400 (lacking support for the I/O cache, and has ethernet problems) - sun4m (e.g. sparc classic, 4, 5, 10, and 20) diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install index eb56c18a544..95bf439d384 100644 --- a/distrib/notes/sparc/install +++ b/distrib/notes/sparc/install @@ -233,13 +233,13 @@ On version 2 OpenBOOT ROMs: ok setenv boot-device /sbus/esp/sd@0,0 -Congratulations, you have successfully installed NetBSD 1.1. When you +Congratulations, you have successfully installed NetBSD RELEASE. When you reboot into NetBSD, you should log in as "root" at the login prompt. There is no initial password, but if you're using the machine in a networked environment, you should create yourself an account and protect it and the "root" account with good passwords. -Some of the files in the NetBSD 1.1 distribution might need to be +Some of the files in the NetBSD RELEASE distribution might need to be tailored for your site. In particular, the /etc/sendmail.cf file will almost definitely need to be adjusted, and other files in /etc will probably need to be modified. If you are unfamiliar with UN*X-like diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis index cbd9dcecc3a..28aadd5331f 100644 --- a/distrib/notes/sparc/whatis +++ b/distrib/notes/sparc/whatis @@ -1,5 +1,5 @@ -NetBSD 1.1 is the second release for the sparc. Many more sparc +NetBSD RELEASE is the second release for the sparc. Many more sparc models and devices are now supported. In addition to the SunOS 4.1 compatibility present in NetBSD/sparc 1.0, -version 1.1 will also run some number of SunOS 5 (SVR4) executables +version RELEASE will also run some number of SunOS 5 (SVR4) executables in binary emulation mode. diff --git a/distrib/pc532/floppies/Makefile b/distrib/pc532/floppies/Makefile index b3fba085312..2dd34f291d9 100644 --- a/distrib/pc532/floppies/Makefile +++ b/distrib/pc532/floppies/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1.2.1 1995/10/31 06:49:34 phil Exp $ +# $NetBSD: Makefile,v 1.2 1995/11/28 23:58:45 jtc Exp $ SUBDIR= inst # upgr diff --git a/distrib/pc532/floppies/Makefile.inc b/distrib/pc532/floppies/Makefile.inc index 138ed9a3ab1..f520de0e077 100644 --- a/distrib/pc532/floppies/Makefile.inc +++ b/distrib/pc532/floppies/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.2 1995/11/06 21:28:18 deraadt Exp $ +# $Id: Makefile.inc,v 1.3 1995/12/14 07:00:30 deraadt Exp $ # Revision is 1.1 REV= 11 diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc index b0836dfdb6e..c928729ee6a 100644 --- a/distrib/pc532/floppies/inst-common/Makefile.inc +++ b/distrib/pc532/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:37:42 deraadt Exp $ +# $NetBSD: Makefile.inc,v 1.5 1995/11/28 23:58:56 jtc Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -59,6 +59,7 @@ unconfig: -/bin/rm -f ${IMAGE} ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} + (cd ${COMMONDIR}; ${MAKE} download.o) crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c diff --git a/distrib/pc532/floppies/inst-common/dot.commonutils b/distrib/pc532/floppies/inst-common/dot.commonutils index 3e991eda76b..a20c781f80a 100644 --- a/distrib/pc532/floppies/inst-common/dot.commonutils +++ b/distrib/pc532/floppies/inst-common/dot.commonutils @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: dot.commonutils,v 1.2 1995/11/06 21:28:20 deraadt Exp $ +# $Id: dot.commonutils,v 1.3 1995/12/14 07:00:35 deraadt Exp $ # Installation utilites (functions), to get NetBSD installed on # the hard disk. These are meant to be invoked from the shell prompt, diff --git a/distrib/pc532/floppies/inst-common/instbin.conf b/distrib/pc532/floppies/inst-common/instbin.conf index 0f15a4e9d3b..3795cfcfa9c 100644 --- a/distrib/pc532/floppies/inst-common/instbin.conf +++ b/distrib/pc532/floppies/inst-common/instbin.conf @@ -1,6 +1,6 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.2 1995/11/06 21:53:53 deraadt Exp $ +# $Id: instbin.conf,v 1.3 1995/12/14 07:00:36 deraadt Exp $ # srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list index 1d739fe68ee..1ac29a41cd6 100644 --- a/distrib/pc532/floppies/inst-common/list +++ b/distrib/pc532/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1995/11/06 21:53:54 deraadt Exp $ +# $Id: list,v 1.3 1995/12/14 07:00:36 deraadt Exp $ # copy the MAKEDEV script and make some devices COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/pc532/floppies/inst-common/mtree.conf b/distrib/pc532/floppies/inst-common/mtree.conf index 4207b0f5d57..4ff0f5df78b 100644 --- a/distrib/pc532/floppies/inst-common/mtree.conf +++ b/distrib/pc532/floppies/inst-common/mtree.conf @@ -1,4 +1,4 @@ -# $Id: mtree.conf,v 1.1.1.1 1995/10/18 08:37:42 deraadt Exp $ +# $Id: mtree.conf,v 1.2 1995/12/14 07:00:37 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -107,5 +107,17 @@ misc # ./usr/share .. +# ./usr/local +local + +# ./usr/local/bin +bin + +# ./usr/local/bin +.. + +# ./usr/local +.. + # ./usr .. diff --git a/distrib/pc532/floppies/inst/install.sh b/distrib/pc532/floppies/inst/install.sh index 25a5e7141a9..b583a543e1a 100644 --- a/distrib/pc532/floppies/inst/install.sh +++ b/distrib/pc532/floppies/inst/install.sh @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: install.sh,v 1.2 1995/11/16 14:20:06 deraadt Exp $ +# $Id: install.sh,v 1.3 1995/12/14 07:00:32 deraadt Exp $ # NetBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index f4396e907ec..aa1c3f57a87 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -17,7 +17,6 @@ ./usr/mdec/bootxx ./usr/mdec/boot ./usr/mdec/binstall -./usr/bin/fdeject ./usr/sbin/eeprom ./usr/sbin/installboot ./usr/sbin/screenblank diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 980334b28cd..09eae2bba8a 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -716,6 +716,8 @@ ./usr/share/nls/Pig/libc.cat ./usr/share/nls/de ./usr/share/nls/de/libc.cat +./usr/share/nls/es +./usr/share/nls/es/libc.cat ./usr/share/nls/fr ./usr/share/nls/fr/libc.cat ./usr/share/skel diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 59f37ed8af2..55eecf09f6c 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -57,6 +57,7 @@ ./usr/share/man/cat1/echo.0 ./usr/share/man/cat1/ed.0 ./usr/share/man/cat1/egrep.0 +./usr/share/man/cat1/eject.0 ./usr/share/man/cat1/env.0 ./usr/share/man/cat1/error.0 ./usr/share/man/cat1/ex.0 diff --git a/distrib/sparc/install.sh b/distrib/sparc/install.sh index e6577411343..e7780c8320f 100644 --- a/distrib/sparc/install.sh +++ b/distrib/sparc/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.2.2.2 1995/11/16 22:30:55 pk Exp $ +# $NetBSD: install.sh,v 1.7 1995/11/16 22:29:46 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe. # All rights reserved. diff --git a/distrib/sparc/upgrade.sh b/distrib/sparc/upgrade.sh index 47d1281c4e4..7ec8b2af240 100644 --- a/distrib/sparc/upgrade.sh +++ b/distrib/sparc/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.3.2.1 1995/11/16 22:30:57 pk Exp $ +# $NetBSD: upgrade.sh,v 1.5 1995/11/16 22:29:48 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe. # All rights reserved. diff --git a/distrib/utils/Makefile.inc b/distrib/utils/Makefile.inc index 7f3eb921dd6..a63f6d43a5a 100644 --- a/distrib/utils/Makefile.inc +++ b/distrib/utils/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2.4.1 1995/11/21 21:26:41 gwr Exp $ +# $NetBSD: Makefile.inc,v 1.3 1995/11/21 21:17:19 gwr Exp $ # utils one might want in a crunched binary BSDSRCDIR?= /usr/src