Module Name: src Committed By: riz Date: Thu Jul 5 18:22:50 UTC 2012
Modified Files: src/distrib/vax/miniroot [netbsd-6]: Makefile.inc list src/distrib/vax/ramdisk [netbsd-6]: Makefile dot.profile list src/etc/etc.vax [netbsd-6]: MAKEDEV.conf src/sys/arch/vax/conf [netbsd-6]: INSTALL Removed Files: src/distrib/vax [netbsd-6]: install.md Log Message: Pull up following revision(s) (requested by abs in ticket #405): etc/etc.vax/MAKEDEV.conf: revision 1.15 etc/etc.vax/MAKEDEV.conf: revision 1.16 sys/arch/vax/conf/INSTALL: revision 1.61 sys/arch/vax/conf/INSTALL: revision 1.62 distrib/vax/install.md: file removal distrib/vax/ramdisk/list: revision 1.30 distrib/vax/miniroot/list: revision 1.15 distrib/vax/miniroot/Makefile.inc: revision 1.22 distrib/vax/ramdisk/Makefile: revision 1.30 distrib/vax/ramdisk/dot.profile: revision 1.9 All apply to vax only: - Drop KERNFS from INSTALL kernel - Add dmesg to sysinst ramdisk - Add 'ramdisk' target to MAKEDEV and use - Add dhcpcd to sysinst ramdisk - Drop old install.md script - Misc install image cleanup (reduce diff to zaurus of all things) Sync devices with GENERIC, and include bpfilter to allow dhcpcd to work Ensure the ramdisk has bpf for dhcpcd To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/distrib/vax/install.md cvs rdiff -u -r1.20.8.1 -r1.20.8.2 src/distrib/vax/miniroot/Makefile.inc cvs rdiff -u -r1.14 -r1.14.4.1 src/distrib/vax/miniroot/list cvs rdiff -u -r1.26.8.1 -r1.26.8.2 src/distrib/vax/ramdisk/Makefile cvs rdiff -u -r1.8 -r1.8.58.1 src/distrib/vax/ramdisk/dot.profile cvs rdiff -u -r1.28 -r1.28.4.1 src/distrib/vax/ramdisk/list cvs rdiff -u -r1.13.4.1 -r1.13.4.2 src/etc/etc.vax/MAKEDEV.conf cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/arch/vax/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/vax/miniroot/Makefile.inc diff -u src/distrib/vax/miniroot/Makefile.inc:1.20.8.1 src/distrib/vax/miniroot/Makefile.inc:1.20.8.2 --- src/distrib/vax/miniroot/Makefile.inc:1.20.8.1 Thu Jul 5 18:16:15 2012 +++ src/distrib/vax/miniroot/Makefile.inc Thu Jul 5 18:22:50 2012 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.20.8.1 2012/07/05 18:16:15 riz Exp $ +# $NetBSD: Makefile.inc,v 1.20.8.2 2012/07/05 18:22:50 riz Exp $ IMAGESIZE= 7m MAKEFS_FLAGS= -o density=3k IMAGEENDIAN= le MAKEDEVTARGETS= all LISTS+= ${DISTRIBDIR}/common/list.sysinst -IMAGEDEPENDS+= ${ARCHDIR}/../install.md \ - ${ARCHDIR}/dot.profile \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ ${DESTDIR}/usr/mdec/boot \ ${KERNOBJDIR}/GENERIC/netbsd Index: src/distrib/vax/miniroot/list diff -u src/distrib/vax/miniroot/list:1.14 src/distrib/vax/miniroot/list:1.14.4.1 --- src/distrib/vax/miniroot/list:1.14 Sun Jul 3 23:11:34 2011 +++ src/distrib/vax/miniroot/list Thu Jul 5 18:22:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2011/07/03 23:11:34 tron Exp $ +# $NetBSD: list,v 1.14.4.1 2012/07/05 18:22:50 riz Exp $ # Vax extras PROG sbin/disklabel @@ -36,5 +36,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md COPY ${DESTDIR}/usr/mdec/boot boot Index: src/distrib/vax/ramdisk/Makefile diff -u src/distrib/vax/ramdisk/Makefile:1.26.8.1 src/distrib/vax/ramdisk/Makefile:1.26.8.2 --- src/distrib/vax/ramdisk/Makefile:1.26.8.1 Wed Jul 4 20:41:47 2012 +++ src/distrib/vax/ramdisk/Makefile Thu Jul 5 18:22:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26.8.1 2012/07/04 20:41:47 jdc Exp $ +# $NetBSD: Makefile,v 1.26.8.2 2012/07/05 18:22:49 riz Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -11,11 +11,10 @@ WARNS= 1 DBG= -Os CRUNCHBIN= ramdiskbin -LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst +LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= le -MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \ - sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1 +MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \ @@ -29,6 +28,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${CRUNCHBIN}: libhack.o .include "${DISTRIBDIR}/common/Makefile.crunch" +.include "${DISTRIBDIR}/common/Makefile.dhcpcd" .include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.image" Index: src/distrib/vax/ramdisk/dot.profile diff -u src/distrib/vax/ramdisk/dot.profile:1.8 src/distrib/vax/ramdisk/dot.profile:1.8.58.1 --- src/distrib/vax/ramdisk/dot.profile:1.8 Sat Jul 26 17:07:43 2003 +++ src/distrib/vax/ramdisk/dot.profile Thu Jul 5 18:22:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.8 2003/07/26 17:07:43 salo Exp $ +# $NetBSD: dot.profile,v 1.8.58.1 2012/07/05 18:22:49 riz Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -39,6 +39,10 @@ TERM=vt100 export TERM HOME=/ export HOME +BLOCKSIZE=1k +export BLOCKSIZE +EDITOR=ed +export EDITOR umask 022 @@ -56,12 +60,10 @@ if [ "X${DONEPROFILE}" = "X" ]; then # mount the ramdisk read write mount -u $ROOTDEV / - # mount the kern_fs so that we can examine the dmesg state - mount -t kernfs /kern /kern - # pull in the functions that people will use from the shell prompt. # . /.commonutils # . /.instutils + grep() sed -n "/$1/p" # run the installation or upgrade script. sysinst Index: src/distrib/vax/ramdisk/list diff -u src/distrib/vax/ramdisk/list:1.28 src/distrib/vax/ramdisk/list:1.28.4.1 --- src/distrib/vax/ramdisk/list:1.28 Sun Jul 3 23:11:34 2011 +++ src/distrib/vax/ramdisk/list Thu Jul 5 18:22:49 2012 @@ -1,6 +1,6 @@ -# $NetBSD: list,v 1.28 2011/07/03 23:11:34 tron Exp $ +# $NetBSD: list,v 1.28.4.1 2012/07/05 18:22:49 riz Exp $ -SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin +SRCDIRS external/bsd/less/bin bin sbin usr.bin usr.sbin PROG bin/cat PROG bin/chmod @@ -22,6 +22,7 @@ PROG bin/sync PROG sbin/chown bin/chgrp PROG sbin/disklabel +PROG sbin/dmesg PROG sbin/fsck PROG sbin/fsck_ffs PROG sbin/ifconfig @@ -30,7 +31,6 @@ PROG sbin/mknod PROG sbin/mount PROG sbin/mount_cd9660 PROG sbin/mount_ffs -PROG sbin/mount_kernfs PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping @@ -45,7 +45,6 @@ PROG usr/bin/ftp PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more PROG usr/bin/sed -# PROG usr/bin/strings # PROG usr/sbin/bad144 PROG usr/sbin/chroot @@ -59,7 +58,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route -LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot in /, and boot blocks in /usr/mdec COPY ${DESTDIR}/boot boot Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.13.4.1 src/etc/etc.vax/MAKEDEV.conf:1.13.4.2 --- src/etc/etc.vax/MAKEDEV.conf:1.13.4.1 Wed Jul 4 20:41:45 2012 +++ src/etc/etc.vax/MAKEDEV.conf Thu Jul 5 18:22:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.13.4.1 2012/07/04 20:41:45 jdc Exp $ +# $NetBSD: MAKEDEV.conf,v 1.13.4.2 2012/07/05 18:22:49 riz Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -9,6 +9,13 @@ all_md) makedev std_vax ;; +ramdisk) + makedev std bpf md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 + makedev rx0 ra0 ra1 ra2 ra3 hp0 hp1 + makedev sd0 sd1 sd2 + makedev cd0 cd1 racd0 racd1 + ;; + std_vax) mkdev ttyg0 c 25 0 mkdev ttyg1 c 25 1 Index: src/sys/arch/vax/conf/INSTALL diff -u src/sys/arch/vax/conf/INSTALL:1.58.2.1 src/sys/arch/vax/conf/INSTALL:1.58.2.2 --- src/sys/arch/vax/conf/INSTALL:1.58.2.1 Wed Jul 4 20:41:45 2012 +++ src/sys/arch/vax/conf/INSTALL Thu Jul 5 18:22:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.58.2.1 2012/07/04 20:41:45 jdc Exp $ +# $NetBSD: INSTALL,v 1.58.2.2 2012/07/05 18:22:49 riz Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -24,7 +24,7 @@ options VAX43 # VS 3100/76 options VAX46 # VS 4000/60 options VAX48 # VS 4000 VLC options VAX49 # VS 4000/90 -options VAX53 # VAX 4000/105A +options VAX53 # VAX 4000/10[058], MicroVAX 3100/m96 # Max users on system; this is just a hint maxusers 8 @@ -38,15 +38,15 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # # Kernel compiled-in symbolic debugger & system call tracer #options DDB -#options DDB_HISTORY_SIZE=100 # enable history editing in DDB +#options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KTRACE #options DIAGNOSTIC,DEBUG,KMEMSTATS,PMAPDEBUG,TRAPDEBUG #options SCSIVERBOSE # Verbose SCSI errors -# Network support -#options GATEWAY -options INET +# Networking options +#options GATEWAY # packet forwarding +options INET # IP + ICMP + TCP + UDP # File systems file-system FFS @@ -54,13 +54,16 @@ file-system FFS #file-system MFS file-system NFS #file-system FDESC -file-system KERNFS +#file-system KERNFS #file-system NULLFS +#file-system OVERLAY # overlay file system #file-system PROCFS #file-system UMAPFS #file-system UNION file-system CD9660 #file-system PTYFS # /dev/pts/N support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system # Filesystem options #options QUOTA # legacy UFS quotas @@ -96,15 +99,17 @@ options WSEMUL_VT100 #options COMPAT_13 options COMPAT_14 options COMPAT_15 +options COMPAT_16 options COMPAT_20 options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. +options COMPAT_50 # NetBSD 5.0 compatibility. #options COMPAT_ULTRIX options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. options USERCONF # userconf(4) support -options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Kernel(s) to compile @@ -112,74 +117,109 @@ config netbsd root on ? type ? mainbus0 at root -# Devices directly attached to mainbus. -sbi* at mainbus0 # SBI's, VAX-11/78[05] main bus -bi* at mainbus0 # VAXBI bus -cmi0 at mainbus0 # 11/750 internal bus. -vsbus0 at mainbus0 # Internal "virtual" VAXstation bus -sbi* at mainbus0 # SBI adapter -uba0 at mainbus0 # Q-Bus adapter -ze0 at mainbus0 # SGEC on-board ethernet -le0 at mainbus0 # LANCE +cpu* at mainbus0 -# Devices connected at VAXBI -cpu0 at bi? node? # KA820/KA825 CPU -cpu* at bi? node? -mem* at bi? node? # Memory subsystems -#uba* at bi? node? # DWBUA BI-Unibus adapter -#ni* at bi? node? # DEBNA/DEBNT ethernet adapter -kdb* at bi? node? # KDB50 MSCP disk ctlr -mscpbus* at kdb? +# All buses; from the beginning attached to mainbus. +abus0 at mainbus0 # Master bus on VAX 86x0 +sbi0 at mainbus0 # SBI, master bus on 11/78x. +cmi0 at mainbus0 # 11/750 internal bus. +bi0 at mainbus0 # VAX 8200 +vsbus0 at mainbus0 # All VAXstations +#nmi0 at mainbus0 # VAX 8800 +#xmi0 at mainbus0 # VAX 6000 +uba0 at mainbus0 # All MicroVAX +ze0 at mainbus0 # KA48, KA49, KA53 +le0 at mainbus0 # LANCE ethernet (MV3400) +#shac0 at mainbus0 # DSSI controller + +# NMI (internal bus) on VAX 88xx-series. +#cpu* at nmi0 slot? # 1-4 KA88 CPUs +#mem* at nmi0 slot? +#bi* at nmi0 slot? # BI bus adapters + +# XMI on VAX 6000 (and higher) +#cpu* at xmi? node? # 1-? VAX 6000 CPUs +#mem* at xmi? node? +#bi* at xmi? node? # XMI-BI adapter -# Devices connected at cmi -mem* at cmi? tr? # Memory subsystems -uba* at cmi? tr? # Unibus adapters -mba* at cmi? tr? # Massbus adapters - -# Devices connected at abus - -# Devices connected at sbi -mem* at sbi? tr? # Memory subsystems -uba* at sbi? tr? # Unibus adapters -mba* at sbi? tr? # Massbus adapters +# Vsbus, the virtual VAXstation bus, and possible devices. +le0 at vsbus0 csr 0x200e0000 # LANCE ethernet +dz0 at vsbus0 csr 0x200a0000 # DC-367 DZ-11 lookalike ctlr +dz0 at vsbus0 csr 0x25000000 # VS4000/90 and 4000/10x serial line +si0 at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr +si1 at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr +asc0 at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr +asc0 at vsbus0 csr 0x26000080 # VS4000/90 and 4000/10x SCSI-ctlr +smg0 at vsbus0 csr 0x200f0000 # Small monochrome display ctlr. +#clr0 at vsbus0 csr 0x30000000 # 4- or 8-bitplans color graphics +spx0 at vsbus0 csr 0x38000000 # Low Cost SPX on VS4000/90. +#lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics +tc0 at vsbus0 csr 0x36000000 # VS4000/60 or 90 TC adapter +tcds* at tc0 slot ? offset ? # TC dual SCSI controller +asc* at tcds? chip ? # PMAZB/C +asc* at tc? slot ? offset ? # PMAZ +fta* at tc? slot ? offset ? # TC FDDI controller -# Devices on Massbus adapters -hp* at mba? drive? # RM/RP disk drives +hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr +rd* at hdc0 drive? # RD5x disks +#ry* at hdc0 drive? # RX floppies -# Devices on internal MicroVAX bus -#asc0 at ibus? # VAX 4000/105A SCSI ctlr +# Devices connected at VAXBI +cpu* at bi? node? # KA820/KA825 CPU +mem* at bi? node? # Memory subsystems +#uba* at bi? node? # DWBUA BI-Unibus adapter +ni* at bi? node? # DEBNA/DEBNT ethernet adapter +kdb* at bi? node? # KDB50 MSCP disk ctlr + +# CMI (VAX 11/750) +mem* at cmi? tr? # Memory subsystems +uba* at cmi? tr? # Unibus adapters +mba* at cmi? tr? # Massbus adapters + +# ABUS (VAX 86x0) +sbi* at abus0 # VAX 86x0 can have up to 2 SBI's. + +# SBI (VAX 11/780, VAX 8600) +mem* at sbi? tr? # Memory subsystems +uba* at sbi? tr? # Unibus adapters +mba* at sbi? tr? # Massbus adapters + +# Devices on Massbus adapters +hp* at mba? drive? # RM/RP disk drives -# Disk controllers at Unibus +# Devices on Unibus/Qbus adapters uda* at uba? csr 0172150 # UDA50/RQDX? uda* at uba? csr 0160334 -mscpbus* at uda? - -# Tape drivers mtc* at uba? csr 0174500 # Tape MSCP ctlr -mscpbus* at mtc? +ts0 at uba? csr 0172520 # TS11/TSV05 tape. +#qd0 at uba? csr 0177400 # 4- or 8-bitplans color graphics +#qv0 at uba? csr 0177400 # Monochrome graphics +de* at uba? csr 0174510 # DELUA/DEUNA +qe* at uba? csr 0174440 # DEQNA/DELQA +qe* at uba? csr 0174460 # DEQNA/DELQA +qt* at uba? csr 0174440 # DELQA-PLUS in Turbo mode +dhu* at uba? csr 0160440 # DHU-11 +#dmf* at uba? csr 0160340 # DMF-32 +dz* at uba? csr 0160100 # DZ-11 +dl* at uba? csr 0176500 # DL-11 +rlc* at uba? csr 0174400 # RL11/RLV11 controller +rl* at rlc? drive? # RL01/RL02 disk drive +rfc0 at uba? csr 0177170 # RX01/02 controller +rf* at rfc? drive? # RX01/RX02 floppy disk drive # MSCP devices -ra* at mscpbus? drive? # MSCP disk +mscpbus* at uda? +mscpbus* at mtc? +mscpbus* at kdb? + +ra* at mscpbus? drive? # MSCP disk racd* at mscpbus? drive? # MSCP CD-ROM (RRD40) rx* at mscpbus? drive? # MSCP floppy mt* at mscpbus? drive? # MSCP tape -# Unibus tapes -#ts* at uba? csr 0172520 # TS11/TSV05 tape. - -# VS2000 builtin MFM controller (HDC9224) -hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr -rd* at hdc0 drive? # RD5x disks - -# SCSI controllers. -asc0 at vsbus0 csr 0x200c0080 # VS4000/{60,VLC} SCSI-controller -asc0 at vsbus0 csr 0x26000080 # VS4000/90 SCSI-controller -si0 at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-controller (5380) -si1 at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-controller (5380) -scsibus* at asc? -scsibus* at si? - # SCSI devices +scsibus* at scsi? + sd* at scsibus? target? lun? st* at scsibus? target? lun? cd* at scsibus? target? lun? @@ -187,34 +227,31 @@ cd* at scsibus? target? lun? #ss* at scsibus? target? lun? #uk* at scsibus? target? lun? -# Ethernet cards -de* at uba? csr 0174510 # DELUA/DEUNA -qe* at uba? csr 0174440 # DEQNA/DELQA -qe* at uba? csr 0174460 # DEQNA/DELQA -le0 at vsbus0 csr 0x200e0000 # LANCE ethernet - - -# Terminal lines -dhu* at uba? csr 0160440 # DHU-11 -dz* at uba? csr 0160100 # DZ-11 -dz0 at vsbus0 csr 0x200a0000# DC-367 -dz0 at vsbus0 csr 0x25000000# VS4000/90 and VAX 4000/10x serial lines -dl* at uba? csr 0176500 # DL-11 - # VAXstation graphics support -#qd0 at uba? csr 0177400 -smg0 at vsbus0 csr 0x200f0000# Small monochrome display ctlr. -wsdisplay0 at smg0 # display device driver. -lkkbd0 at dz0 line 0 # Keyboard LK201 -wskbd0 at lkkbd0 # wscons keyboard +wsdisplay* at smg0 +wsdisplay* at spx0 +#wsdisplay* at lcg0 +#wsdisplay* at clr0 +#wsdisplay* at qd0 +#wsdisplay* at qv0 +lkkbd0 at dz0 line 0 +wskbd* at lkkbd? console ? +#lkms0 at dz0 line 1 +#wsmouse* at lkms? + +# +# accept filters +#pseudo-device accf_data # "dataready" accept filter +#pseudo-device accf_http # "httpready" accept filter pseudo-device loop 1 pseudo-device pty 2 # pseudo-terminals (Sysinst needs two) -#pseudo-device bpfilter +pseudo-device bpfilter #pseudo-device tun #pseudo-device gre # generic L3 over IP tunnel #pseudo-device vnd #pseudo-device ccd 4 -#pseudo-device raid 4 # RAIDframe disk driver +pseudo-device raid 8 # RAIDframe disk driver #pseudo-device fss # file system snapshot device + pseudo-device md