use makeconf.awk, and also simplify list management

2 files changed, 8 insertions, 74 deletions

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