Module Name: src Committed By: abs Date: Tue Jul 3 21:49:56 UTC 2012
Modified Files: src/distrib/vax/miniroot: Makefile.inc list src/distrib/vax/ramdisk: Makefile dot.profile list src/etc/etc.vax: MAKEDEV.conf src/sys/arch/vax/conf: INSTALL Removed Files: src/distrib/vax: install.md Log Message: 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) To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/distrib/vax/install.md cvs rdiff -u -r1.21 -r1.22 src/distrib/vax/miniroot/Makefile.inc cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/miniroot/list cvs rdiff -u -r1.29 -r1.30 src/distrib/vax/ramdisk/Makefile \ src/distrib/vax/ramdisk/list cvs rdiff -u -r1.8 -r1.9 src/distrib/vax/ramdisk/dot.profile cvs rdiff -u -r1.14 -r1.15 src/etc/etc.vax/MAKEDEV.conf cvs rdiff -u -r1.60 -r1.61 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.21 src/distrib/vax/miniroot/Makefile.inc:1.22 --- src/distrib/vax/miniroot/Makefile.inc:1.21 Mon Jul 2 22:42:18 2012 +++ src/distrib/vax/miniroot/Makefile.inc Tue Jul 3 21:49:55 2012 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.21 2012/07/02 22:42:18 abs Exp $ +# $NetBSD: Makefile.inc,v 1.22 2012/07/03 21:49:55 abs 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.15 --- src/distrib/vax/miniroot/list:1.14 Sun Jul 3 23:11:34 2011 +++ src/distrib/vax/miniroot/list Tue Jul 3 21:49:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2011/07/03 23:11:34 tron Exp $ +# $NetBSD: list,v 1.15 2012/07/03 21:49:55 abs 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.29 src/distrib/vax/ramdisk/Makefile:1.30 --- src/distrib/vax/ramdisk/Makefile:1.29 Thu Jun 28 13:53:49 2012 +++ src/distrib/vax/ramdisk/Makefile Tue Jul 3 21:49:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/06/28 13:53:49 abs Exp $ +# $NetBSD: Makefile,v 1.30 2012/07/03 21:49:56 abs 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} \ Makefile 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/list diff -u src/distrib/vax/ramdisk/list:1.29 src/distrib/vax/ramdisk/list:1.30 --- src/distrib/vax/ramdisk/list:1.29 Wed Mar 21 05:49:17 2012 +++ src/distrib/vax/ramdisk/list Tue Jul 3 21:49:56 2012 @@ -1,6 +1,6 @@ -# $NetBSD: list,v 1.29 2012/03/21 05:49:17 matt Exp $ +# $NetBSD: list,v 1.30 2012/07/03 21:49:56 abs 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 @@ -61,7 +60,7 @@ SPECIAL ping srcdir distrib/utils/x_pin SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -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/distrib/vax/ramdisk/dot.profile diff -u src/distrib/vax/ramdisk/dot.profile:1.8 src/distrib/vax/ramdisk/dot.profile:1.9 --- src/distrib/vax/ramdisk/dot.profile:1.8 Sat Jul 26 17:07:43 2003 +++ src/distrib/vax/ramdisk/dot.profile Tue Jul 3 21:49:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.8 2003/07/26 17:07:43 salo Exp $ +# $NetBSD: dot.profile,v 1.9 2012/07/03 21:49:56 abs 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/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.14 src/etc/etc.vax/MAKEDEV.conf:1.15 --- src/etc/etc.vax/MAKEDEV.conf:1.14 Fri Jun 22 20:42:22 2012 +++ src/etc/etc.vax/MAKEDEV.conf Tue Jul 3 21:49:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.14 2012/06/22 20:42:22 abs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.15 2012/07/03 21:49:56 abs 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 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.60 src/sys/arch/vax/conf/INSTALL:1.61 --- src/sys/arch/vax/conf/INSTALL:1.60 Fri Jun 22 20:42:23 2012 +++ src/sys/arch/vax/conf/INSTALL Tue Jul 3 21:49:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.60 2012/06/22 20:42:23 abs Exp $ +# $NetBSD: INSTALL,v 1.61 2012/07/03 21:49:56 abs Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -54,7 +54,7 @@ file-system FFS #file-system MFS file-system NFS #file-system FDESC -file-system KERNFS +#file-system KERNFS #file-system NULLFS #file-system PROCFS #file-system UMAPFS