use makeconf.awk, and also simplify list management

7 files changed, 77 insertions, 110 deletions

diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 9f679a2e64c..5d11143c193 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.5 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2002/04/30 03:47:03 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		ramdisk${REV}.fs
-CRUNCHCONF?=    ${TOP}/common/${CBIN}.conf
 
 MOUNT_POINT=	/mnt
 
@@ -28,6 +27,8 @@ RDSETROOT=	elfrdsetroot
 
 .include "${TOP}/inst-common/Makefile.inc"
 
+LISTS+=		${.CURDIR}/list
+
 all: ${CBIN} bsd.rd
 
 DISKTYPE=       rdroot
diff --git a/distrib/alpha/bsd.rd/list b/distrib/alpha/bsd.rd/list
index ba0bf42bfe5..e68bfef5aea 100644
--- a/distrib/alpha/bsd.rd/list
+++ b/distrib/alpha/bsd.rd/list
@@ -1 +1 @@
-LINK   sbin/mount_ffs		sbin/mount_cd9660
+LINK	instbin					sbin/mount_cd9660
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index eb134a8015b..c0b169760ed 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2002/04/30 03:47:03 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		ramdisk${REV}.fs
-CRUNCHCONF?=    ${TOP}/common/${CBIN}.conf
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index cf4339dccbb..369ec6730ee 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,67 @@
-#	$OpenBSD: list,v 1.6 2002/04/30 01:31:19 deraadt Exp $
+#
+#	$OpenBSD: list,v 1.7 2002/04/30 03:47:03 deraadt Exp $
+#
+
+SRCDIRS distrib/special
+SRCDIRS bin sbin gnu/usr.bin usr.bin usr.sbin
+SRCDIRS sys/arch/alpha/stand
+
+# copy the crunched binary, link to it, and kill it
+COPY	${OBJDIR}/instbin			instbin
+LINK	instbin					bin/cat
+LINK	instbin					bin/chmod bin/chgrp sbin/chown
+LINK	instbin					bin/cp
+LINK	instbin					bin/dd
+LINK	instbin					bin/df
+LINK	instbin					bin/ed
+LINK	instbin					bin/ln
+LINK	instbin					bin/ls
+LINK	instbin					bin/mkdir
+LINK	instbin					bin/mv
+LINK	instbin					bin/ksh bin/sh
+ARGVLINK ksh					-sh
+LINK	instbin					bin/rm
+LINK	instbin					bin/stty
+LINK	instbin					bin/sleep
+LINK	instbin					sbin/disklabel
+LINK	instbin					sbin/dmesg
+LINK	instbin					sbin/hostname
+LINK	instbin					sbin/fsck
+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/newfs sbin/mount_mfs
+LINK	instbin					sbin/reboot sbin/halt
+LINK	instbin					sbin/route
+LINK	instbin					sbin/umount
+LINK	instbin					usr/bin/ftp
+LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK	instbin					usr/bin/gzip
+LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/sed
+LINK	instbin					usr/bin/pax bin/cpio bin/tar
+#LINK	instbin					usr/mdec/installboot
+
+# copy the MAKEDEV script and make some devices
+SCRIPT	${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
+SPECIAL	cd dev; sh MAKEDEV ramdisk
+
+# we need the contents of /usr/mdec XXX - no it's not necessary and won't fit.
+#COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
+#COPY	${DESTDIR}/usr/mdec/bootxx		usr/mdec/bootxx
+
+# various files that we need in /etc for the install
+COPY	${DESTDIR}/etc/group			etc/group
+COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
+COPY	${CURDIR}/../../miniroot/services	etc/services
+COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
+TERMCAP	vt100,vt200,dumb			usr/share/misc/termcap
+
+# so DNS can work
+SYMLINK /tmp/resolv.conf.shadow			etc/resolv.conf
 
 # and the installation tools
 SCRIPT	${CURDIR}/../../miniroot/dot.profile	.profile
diff --git a/distrib/alpha/common/raminst.conf b/distrib/alpha/common/raminst.conf
deleted file mode 100644
index d4f0afad1cc..00000000000
--- a/distrib/alpha/common/raminst.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#	$OpenBSD: raminst.conf,v 1.5 2001/10/20 21:35:57 deraadt Exp $
-#
-# ram.conf - unified binary for the RAM disk
-#
-
-srcdirs distrib/special bin sbin gnu/usr.bin usr.bin usr.sbin
-srcdirs sys/arch/alpha/stand
-
-progs cat chmod cp dd df disklabel ed grep fsck_ffs ftp 
-progs gzip ifconfig init less ln ls mkdir mknod mount
-progs mount_ffs mount_cd9660 mv newfs ksh
-progs reboot rm route sed sleep stty pax umount
-progs dmesg hostname
-
-ln chmod chgrp
-ln chmod chown
-ln fsck_ffs fsck
-ln ksh sh
-ln ksh -sh		# init invokes the shell this way
-ln mount_ffs ffs
-ln newfs mount_mfs
-ln grep egrep
-ln grep fgrep
-ln less more
-ln reboot halt
-ln pax tar
-ln pax cpio
-
-libs -lutil -lotermcap -lm
diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc
index dd2d7942150..45410f922b7 100644
--- a/distrib/alpha/inst-common/Makefile.inc
+++ b/distrib/alpha/inst-common/Makefile.inc
@@ -1,19 +1,22 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.5 2002/04/28 18:28:33 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2002/04/30 03:47:03 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
 
-CBIN?=		raminst
+CBIN?=		instbin
 COMMONDIR=	${TOP}/inst-common
 UTILS=		${TOP}/../miniroot
 
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
-LISTS=		${COMMONDIR}/list ${.CURDIR}/list ${.CURDIR}/../common/list
-CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
+LISTS?=		${.CURDIR}/../common/list
+CRUNCHCONF?=	${CBIN}.conf
 MTREE=		${UTILS}/mtree.conf
 
+${CRUNCHCONF}: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
 
@@ -25,6 +28,7 @@ do_files:
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS}\
 	    sh ${UTILS}/runlist.sh ${LISTS}
+	rm ${MOUNT_POINT}/${CBIN}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list
deleted file mode 100644
index 3a3d3116316..00000000000
--- a/distrib/alpha/inst-common/list
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#	$OpenBSD: list,v 1.25 2002/04/30 01:31:19 deraadt Exp $
-#
-
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/raminst		raminst
-LINK	raminst				bin/cat
-LINK	raminst				bin/chmod bin/chgrp sbin/chown
-LINK	raminst				bin/cp
-LINK	raminst				bin/cpio
-LINK	raminst				bin/dd
-LINK	raminst				bin/df
-LINK	raminst				bin/ed
-#LINK	raminst				bin/expr
-LINK	raminst				bin/ln
-LINK	raminst				bin/ls
-LINK	raminst				bin/mkdir
-LINK	raminst				bin/mv
-LINK	raminst				bin/ksh bin/sh
-ARGVLINK ksh				-sh
-LINK	raminst				bin/rm
-LINK	raminst				bin/stty
-LINK	raminst				bin/sleep
-LINK	raminst				bin/tar
-LINK	raminst				sbin/disklabel
-LINK	raminst				sbin/dmesg
-LINK	raminst				sbin/hostname
-LINK	raminst				sbin/fsck
-LINK	raminst				sbin/halt
-#LINK	raminst				sbin/dhclient
-LINK	raminst				sbin/ifconfig
-LINK	raminst				sbin/init
-LINK	raminst				sbin/mknod
-LINK	raminst				sbin/mount
-#LINK	raminst				sbin/mount_cd9660
-LINK	raminst				sbin/mount_ffs
-LINK	raminst				sbin/mount_mfs
-LINK	raminst				sbin/newfs
-LINK	raminst				sbin/reboot
-LINK	raminst				sbin/route
-LINK	raminst				sbin/umount
-LINK	raminst				usr/bin/ftp
-LINK	raminst				usr/bin/egrep
-LINK	raminst				usr/bin/fgrep
-LINK	raminst				usr/bin/grep
-LINK	raminst				usr/bin/gzip
-LINK	raminst				usr/bin/less
-LINK	raminst				usr/bin/more
-LINK	raminst				usr/bin/sed
-LINK	raminst				usr/bin/pax
-#LINK	raminst				usr/mdec/installboot
-SPECIAL	/bin/rm raminst
-
-# copy the MAKEDEV script and make some devices
-SCRIPT	${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV ramdisk
-
-# we need the contents of /usr/mdec XXX - no it's not necessary and won't fit.
-#COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
-#COPY	${DESTDIR}/usr/mdec/bootxx		usr/mdec/bootxx
-
-# various files that we need in /etc for the install
-COPY	${DESTDIR}/etc/group			etc/group
-COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
-COPY	${CURDIR}/../../miniroot/services	etc/services
-COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
-TERMCAP	vt100,vt200,dumb			usr/share/misc/termcap
-
-# so DNS can work
-SYMLINK /tmp/resolv.conf.shadow			etc/resolv.conf