fit vi onto sparc ramdisk

4 files changed, 7 insertions, 34 deletions

diff --git a/distrib/miniroot/makeconf.awk b/distrib/miniroot/makeconf.awk
index f7b125396d9..d5a6ef15f95 100644
--- a/distrib/miniroot/makeconf.awk
+++ b/distrib/miniroot/makeconf.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: makeconf.awk,v 1.5 1997/05/01 00:33:11 deraadt Exp $
+#	$OpenBSD: makeconf.awk,v 1.6 1997/05/15 00:11:13 deraadt Exp $
 #	$NetBSD: makeconf.awk,v 1.3 1996/05/04 15:45:32 pk Exp $
 
 #
@@ -7,7 +7,7 @@
 
 BEGIN {
 	printf("#\n# This file is automatically generated by `makeconf'\n#\n\n");
-	printf("\nlibs -ledit -lutil -lcurses -ltermcap -ll -lm -lkvm -lz -lkrb -ldes\n");
+	printf("\nlibs -ledit -lutil -lcurses -ltermlib -ll -lm -lkvm -lz -lkrb -ldes\n");
 
 }
 
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index c15f6a1eb5e..b30d16f3421 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,7 +1,8 @@
-#	$OpenBSD: list,v 1.2 1997/05/14 21:52:59 deraadt Exp $
+#	$OpenBSD: list,v 1.3 1997/05/15 00:11:14 deraadt Exp $
 #	$NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
 
 SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
+SRCDIRS	usr.bin/vi
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -41,18 +42,13 @@ LINK	instbin			sbin/ping
 LINK	instbin			sbin/route
 LINK	instbin			sbin/slattach
 LINK	instbin			sbin/umount
-SYMLINK	../../instbin		usr/bin/chflags
 SYMLINK	../../instbin		usr/sbin/chown usr/bin/chgrp
 SYMLINK	../../instbin		usr/sbin/chroot
 SYMLINK	../../instbin		usr/bin/ftp
 SYMLINK	../../instbin		usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 SYMLINK	../../instbin		usr/bin/sed
-SYMLINK	../../instbin		usr/bin/vim usr/bin/vi
+SYMLINK	../../instbin		usr/bin/build usr/bin/vi
 
-# `internal' crunchgen links
-ARGVLINK mount_ffs	ffs
-ARGVLINK mount_nfs	nfs
-ARGVLINK mount_cd9660	cd9660
 ARGVLINK pdksh		-sh
 
 # various files that we need in /etc for the install
@@ -60,7 +56,6 @@ COPY	${DESTDIR}/etc/group		etc/group
 COPY	${DESTDIR}/etc/protocols	etc/protocols
 COPY	${DESTDIR}/etc/services		etc/services
 COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
-COPY	${DESTDIR}/etc/virc		etc/virc
 
 # and the installation scripts
 COPY	${CURDIR}/../miniroot/install.sub		install.sub
diff --git a/distrib/ramdisk/mtree.conf b/distrib/ramdisk/mtree.conf
index a6df07efa8f..ee15902a700 100644
--- a/distrib/ramdisk/mtree.conf
+++ b/distrib/ramdisk/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.1 1997/05/14 20:44:35 deraadt Exp $
+#	$OpenBSD: mtree.conf,v 1.2 1997/05/15 00:11:15 deraadt Exp $
 #	$NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -71,23 +71,6 @@ misc
 # ./usr/share/misc
 ..
 
-# ./usr/share/zoneinfo
-zoneinfo
-# ./usr/share/zoneinfo
-..
-
-# ./usr/share/keymaps
-keymaps
-# ./usr/share/keymaps
-
-# ./usr/share/keymaps/atari
-atari
-# ./usr/share/keymaps/atari
-..
-
-# ./usr/share/keymaps
-..
-
 # ./usr/share
 ..
 
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 61829df776c..34729650e39 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,19 +1,14 @@
-#	$OpenBSD: list,v 1.1 1997/05/14 20:44:37 deraadt Exp $
+#	$OpenBSD: list,v 1.2 1997/05/15 00:11:17 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
 LINK	instbin			sbin/disklabel
 
 SYMLINK	../../instbin		usr/bin/basename
-SYMLINK ../../instbin		usr/bin/cksum usr/bin/sum
-SYMLINK ../../instbin		usr/bin/getopt
 SYMLINK ../../instbin		usr/bin/grep usr/bin/egrep usr/bin/fgrep
-SYMLINK ../../instbin		usr/bin/netstat
 SYMLINK ../../instbin		usr/bin/rsh
-SYMLINK ../../instbin		usr/bin/tset usr/bin/reset
 SYMLINK	../../instbin		usr/bin/less usr/bin/more
 SYMLINK	../../instbin		usr/sbin/installboot
-SYMLINK	../../instbin		usr/sbin/sysctl
 
 SRCDIRS	sys/arch/sparc/stand