More tree syncing.

4 files changed, 29 insertions, 28 deletions

diff --git a/distrib/vax/inst-common/Makefile.inc b/distrib/vax/inst-common/Makefile.inc
index 340266491d8..66b11f0c266 100644
--- a/distrib/vax/inst-common/Makefile.inc
+++ b/distrib/vax/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1997/09/26 02:12:09 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2001/03/16 04:55:52 hugh Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -32,23 +32,22 @@ all: ${CBIN} bootroot
 	umount -f ${MOUNT_POINT}
 	vnconfig -u ${VND}
 
-bootroot: edlabel copy xxboot boot
-	dd if=/dev/zero of=${BOOTSYS} bs=64k count=4
+bootroot: xxboot boot
+	dd if=/dev/zero of=${BOOTSYS} bs=512 count=8192
 	vnconfig -v -c ${VND} ${BOOTSYS}
 	disklabel -w ${VND} bootroot
 	newfs -O -m 0 -o space -i 8192 ${VND_RDEV}
 	dd if=xxboot of=${VND_RDEV} count=16
 	mount ${VND_DEV} ${MOUNT_POINT}
-	cp edlabel copy boot ${MOUNT_POINT}
+	cp boot ${MOUNT_POINT}
 	umount -f ${MOUNT_POINT}
 	vnconfig -u ${VND}
 
-edlabel copy xxboot boot:
-	(cd /sys/arch/vax/boot;make)
-	cp /sys/arch/vax/boot/edlabel .
-	cp /sys/arch/vax/boot/copy .
-	cp /sys/arch/vax/boot/xxboot .
-	cp /sys/arch/vax/boot/boot .
+xxboot boot:
+	(cd /usr/src/sys/arch/vax/boot;make)
+	cp /usr/src/sys/arch/vax/boot/xxboot/xxboot .
+	cp /usr/src/sys/arch/vax/boot/boot/boot .
+
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
@@ -56,7 +55,7 @@ unconfig:
 	-/bin/rm -f ${IMAGE}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen ${CRUNCHCONF}
+	crunchgen -D ${TOP}/../../ -L ${DESTDIR}/usr/lib ${.ALLSRC}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk
diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf
index a4ac3635ae8..79743f37210 100644
--- a/distrib/vax/inst-common/instbin.conf
+++ b/distrib/vax/inst-common/instbin.conf
@@ -1,23 +1,25 @@
-# $OpenBSD: instbin.conf,v 1.6 2000/06/09 17:42:55 mickey Exp $	
+# $OpenBSD: instbin.conf,v 1.7 2001/03/16 04:55:52 hugh Exp $	
 #
-# kcbin.conf - unified binary for the kc floppy
+# instbin.conf - unified binary for the kc floppy
 #
 
-srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
-srcdirs /usr/src/gnu/usr.bin
+srcdirs bin sbin usr.bin usr.sbin
+srcdirs gnu/usr.bin
+
 
 progs gawk cat chmod chroot cp df disklabel ed expr fsck ftp 
 progs ifconfig init ln ls mkdir mknod more mount mt dd
-progs mount_ffs mount_nfs mv newfs reboot rm route sed sh shutdown
-progs slattach strings stty sync tar test umount update
+progs mount_ffs mount_nfs mv newfs reboot rm route sed ksh shutdown
+progs slattach strings stty sync test umount pax
 
 ln chmod chgrp
 ln chmod chown
 ln mount_ffs ffs
 ln mount_nfs nfs
-ln gawk awk
-ln sh -sh		# init invokes the shell this way
+ln ksh -sh		# init invokes the shell this way
+ln ksh sh
+ln pax tar
 ln test [
 ln reboot halt
 
-libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm
+libs -ledit -lutil -ltermcap -ll -lz -lm -lcompat
diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list
index 18e740813be..72582b9e45f 100644
--- a/distrib/vax/inst-common/list
+++ b/distrib/vax/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.8 2000/07/15 02:21:02 deraadt Exp $
+#	$OpenBSD: list,v 1.9 2001/03/16 04:55:50 hugh Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -40,16 +40,15 @@ LINK	instbin			usr/bin/awk
 LINK	instbin			usr/bin/ftp
 LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/sed
-LINK	instbin			usr/bin/strings
 LINK	instbin			usr/bin/tar
+LINK	instbin			usr/sbin/chown
 # LINK	instbin			usr/sbin/bad144
 LINK	instbin			usr/sbin/chroot
-LINK	instbin			usr/sbin/update
 SPECIAL	/bin/rm instbin
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV std tms0 ra0 ra1 ra2 ra3 ra4 ra5 ra6 ra7
+SPECIAL	cd dev; sh MAKEDEV raminst
 
 # we need the contents of /usr/mdec (XXX)
 # COPY	${DESTDIR}/usr/mdec/*	usr/mdec
@@ -66,5 +65,6 @@ COPY	${DESTDIR}/etc/spwd.db		etc
 # and the common installation tools
 COPY	${TOPDIR}/inst-common/termcap.vt	usr/share/misc/termcap
 
-COPY	/gennetbsd			.
-COPY	/boot				.
+COPY	${DESTDIR}/bsd			.
+COPY	${DESTDIR}/boot			.
+
diff --git a/distrib/vax/inst/dot.profile b/distrib/vax/inst/dot.profile
index 09ddc83d334..d7b79617546 100644
--- a/distrib/vax/inst/dot.profile
+++ b/distrib/vax/inst/dot.profile
@@ -5,10 +5,10 @@ TERM=vt100 export TERM
 echo 'erase ^?, werase ^H, kill ^U, intr ^C, status ^T'
 stty newcrt werase ^H intr ^C kill ^U erase ^? status ^T
 echo
-echo "Now when NetBSD is booted you're on your own."
+echo "Now when OpenBSD is booted you're on your own."
 echo "Remember to write bootblocks and to make devices"
 echo "in dev in your new root filesystem before booting."
-echo "Also remember to copy /gennetbsd and /boot to the"
+echo "Also remember to copy /bsd and /boot to the"
 echo "new root; it's not there by default."
 echo
 echo "Good luck!"