Deal with the chgrp chown -> chmod change.

instead of generating a text file from list, just create it
and edit it directly, allows for more control.
Also i386 edits this file directly instead of using awk to generate it.

3 files changed, 34 insertions, 109 deletions

diff --git a/distrib/powerpc/ramdisk/Makefile b/distrib/powerpc/ramdisk/Makefile
index 8ae15503f48..fa5e9f35186 100644
--- a/distrib/powerpc/ramdisk/Makefile
+++ b/distrib/powerpc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2000/01/24 03:46:55 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.9 2000/06/15 02:49:00 rahnds Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -73,11 +73,8 @@ unconfig:
 install:
 	cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD}
 
-${CBIN}.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
-
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf
+	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
diff --git a/distrib/powerpc/ramdisk/instbin.conf b/distrib/powerpc/ramdisk/instbin.conf
new file mode 100644
index 00000000000..4e855efeca7
--- /dev/null
+++ b/distrib/powerpc/ramdisk/instbin.conf
@@ -0,0 +1,32 @@
+#       $OpenBSD: instbin.conf,v 1.1 2000/06/15 02:49:00 rahnds Exp $
+#
+# instbin.conf - unified binary for the inst/upgr floppies
+#
+
+srcdirs distrib/special
+srcdirs usr.bin bin sbin usr.sbin gnu/usr.bin
+srcdirs usr.sbin/pppd
+
+progs dd mount_cd9660 df mount mount_ext2fs sync restore newfs_msdos
+progs stty ln disklabel pax ping cat ifconfig ls
+progs less mount_nfs fdisk grep umount mount_msdos rsh fsck
+progs scsi chat mknod route ftp mount_ffs reboot ed
+progs cp gzip chmod fsck_ffs sort init newfs mount_kernfs
+progs tip rm mt mkdir pppd sed ksh sleep
+progs mv expr test hostname
+
+ln chmod chgrp
+ln chmod chown
+ln pax tar
+ln pax cpio
+ln less more
+ln grep fgrep
+ln grep egrep
+ln reboot halt
+ln gzip gunzip
+ln gzip gzcat
+ln ksh sh
+ln ksh -sh
+ln test [
+
+libs -ledit -lutil -lcurses -ll -lm -lkvm -lz -lkrb -ldes
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
deleted file mode 100644
index d0bd950b090..00000000000
--- a/distrib/powerpc/ramdisk/list
+++ /dev/null
@@ -1,104 +0,0 @@
-#	$OpenBSD: list,v 1.12 2000/06/09 17:42:54 mickey Exp $
-
-SRCDIRS distrib/special
-SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
-SRCDIRS usr.sbin/pppd
-#SRCDIRS usr.bin/vi
-
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/instbin	instbin
-LINK	instbin			bin/cat
-LINK	instbin			bin/chmod
-LINK	instbin			bin/chgrp
-LINK	instbin			bin/cp
-LINK	instbin			bin/dd
-LINK	instbin			bin/df
-LINK	instbin			bin/ed
-LINK	instbin			bin/expr
-LINK	instbin			bin/hostname
-LINK	instbin			bin/ln
-LINK	instbin			bin/ls
-LINK	instbin			bin/mkdir
-LINK	instbin			bin/mt
-LINK	instbin			bin/mv
-LINK	instbin			bin/pax bin/tar bin/cpio
-LINK	instbin			bin/rm
-LINK	instbin			bin/ksh bin/sh
-ARGVLINK ksh			-sh
-LINK	instbin			bin/sleep
-LINK	instbin			bin/stty
-LINK	instbin			bin/sync
-LINK	instbin			bin/test bin/[
-LINK	instbin			sbin/chown
-LINK	instbin			sbin/disklabel
-LINK	instbin			sbin/fdisk
-LINK	instbin			sbin/fsck
-LINK	instbin			sbin/fsck_ffs
-LINK	instbin			sbin/reboot sbin/halt
-LINK	instbin			sbin/ifconfig
-LINK	instbin			sbin/init
-LINK	instbin			sbin/mknod
-LINK	instbin			sbin/mount
-LINK	instbin			sbin/mount_cd9660
-LINK	instbin			sbin/mount_ffs
-LINK	instbin			sbin/mount_msdos
-LINK	instbin			sbin/mount_nfs
-LINK	instbin			sbin/mount_kernfs
-LINK	instbin			sbin/mount_ext2fs
-LINK	instbin			sbin/newfs
-LINK	instbin			sbin/newfs_msdos
-LINK	instbin			sbin/ping
-LINK	instbin			sbin/restore
-LINK	instbin			sbin/route
-#LINK	instbin			sbin/slattach
-LINK	instbin			sbin/scsi
-LINK	instbin			sbin/umount
-LINK	instbin			usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK	instbin			usr/bin/ftp
-LINK	instbin			usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin			usr/bin/less usr/bin/more
-LINK	instbin			usr/bin/rsh
-LINK	instbin			usr/bin/sed
-LINK	instbin			usr/bin/sort
-LINK	instbin			usr/bin/tip
-LINK	instbin			usr/sbin/chat
-LINK	instbin			usr/sbin/pppd
-#SYMLINK ../../instbin           usr/bin/build usr/bin/vi
-
-# copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL	/bin/rm dev/MAKEDEV
-
-# we need the contents of /usr/mdec
-COPY	${DESTDIR}/usr/mdec/ofwboot	usr/mdec/ofwboot
-COPY	${DESTDIR}/usr/mdec/mbr		usr/mdec/mbr
-COPY	${DESTDIR}/usr/mdec/msdos1mb.gz	usr/mdec/msdos1mb.gz
-
-# various files that we need in /etc for the install
-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/disktab		etc/disktab
-SYMLINK	/tmp/disktab.shadow		etc/disktab      
-SYMLINK	/tmp/fstab.shadow		etc/fstab
-SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
-SYMLINK	/tmp/hosts			etc/hosts
-
-
-COPYDIR	${DESTDIR}/etc/ppp		etc/ppp
-
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
-#COPY	${DESTDIR}/usr/share/misc/scsi_modes	usr/share/misc/scsi_modes
-
-# and the installation tools
-COPY	dot.profile			.profile
-COPY	dot.instutils			.instutils
-COPY	install.md			install.md
-COPY	${CURDIR}/../../miniroot/install.sh		install
-COPY	${CURDIR}/../../miniroot/upgrade.sh		upgrade
-#SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
-SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
-SPECIAL	chmod 755 install