make use of makeconf.awk

9 files changed, 24 insertions, 62 deletions

diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index d27f95909dd..4ba773dc0aa 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2002/04/30 01:05:22 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2002/04/30 03:23:57 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -7,7 +7,7 @@ IMAGE=		mr.fs
 CBIN?=		instbin
 CRUNCHCONF?=	${CBIN}.conf
 CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
-LISTS?=		${.CURDIR}/../common/list ${.CURDIR}
+LISTS?=		${.CURDIR}/../common/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
@@ -107,14 +107,15 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
-${CRUNCHCONF}: ${CRUNCHCONFS}
-	cat ${CRUNCHCONFS} > ${CRUNCHCONF}
+${CRUNCHCONF}: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
 
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	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 \
diff --git a/distrib/i386/common/crunch.conf b/distrib/i386/common/crunch.conf
deleted file mode 100644
index 9ebc2aab52a..00000000000
--- a/distrib/i386/common/crunch.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#	$OpenBSD: crunch.conf,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-#
-# instbin.conf - unified binary for the inst/upgr floppies
-#
-
-srcdirs distrib/special bin sbin usr.bin/less gnu/usr.bin usr.bin usr.sbin
-srcdirs sys/arch/i386/stand
-
-progs cat chmod cp dd df disklabel dhclient dmesg ed
-progs fsck_ffs ftp fdisk hostname
-progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_msdos mount_ext2fs
-progs mv newfs pax ksh ping reboot rm route
-progs sed sleep stty umount kbd
-progs rsh restore gzip grep installboot
-
-ln chmod chgrp
-ln chmod chown
-ln fsck_ffs fsck
-ln less more
-ln pax tar
-ln pax cpio
-ln ksh sh
-ln ksh -sh		# init invokes the shell this way
-ln reboot halt
-ln gzip gunzip
-ln grep egrep
-ln grep fgrep
-
-# Use -lotermcap instead of -ltermcap/-lcurses since it is smaller
-libs -lutil -lotermcap -lkrb -ldes -ll -lm
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 6ab65be188b..fbd9430d28d 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,12 +1,15 @@
-#	$OpenBSD: list,v 1.4 2002/04/30 01:31:20 deraadt Exp $
+#	$OpenBSD: list,v 1.5 2002/04/30 03:23:57 deraadt Exp $
+
+SRCDIRS distrib/special
+SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
+SRCDIRS sys/arch/i386/stand
 
 # 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/cpio bin/pax bin/tar
+LINK	instbin					bin/pax bin/cpio bin/tar
 LINK	instbin					bin/dd
 LINK	instbin					bin/df
 LINK	instbin					bin/ed
@@ -16,16 +19,16 @@ LINK	instbin					bin/mkdir
 LINK	instbin					bin/mv
 LINK	instbin					bin/rm
 LINK	instbin					bin/hostname
-LINK	instbin					bin/sh bin/ksh
+LINK	instbin					bin/ksh bin/sh
 LINK	instbin					bin/sleep
 LINK	instbin					bin/stty
-LINK	instbin					sbin/chown
+LINK	instbin					sbin/chmod bin/chgrp sbin/chown
 LINK	instbin					sbin/disklabel
 LINK	instbin					sbin/dhclient
 LINK	instbin					sbin/fdisk
 LINK	instbin					sbin/dmesg
 LINK	instbin					sbin/fsck sbin/fsck_ffs
-LINK	instbin					sbin/halt sbin/reboot
+LINK	instbin					sbin/reboot sbin/halt
 LINK	instbin					sbin/ifconfig
 LINK	instbin					sbin/init
 LINK	instbin					sbin/mknod
@@ -40,7 +43,7 @@ LINK	instbin					sbin/restore
 LINK	instbin					sbin/route
 LINK	instbin					sbin/umount
 LINK	instbin					sbin/kbd
-LINK	instbin					usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 LINK	instbin					usr/bin/less usr/bin/more
@@ -48,7 +51,6 @@ LINK	instbin					usr/bin/rsh
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/mdec/installboot
 ARGVLINK ksh					-sh
-SPECIAL	/bin/rm instbin
 
 # copy the MAKEDEV script and make some devices
 SCRIPT ${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
diff --git a/distrib/i386/ramdiskC/Makefile b/distrib/i386/ramdiskC/Makefile
index 604bb27f971..31e15412957 100644
--- a/distrib/i386/ramdiskC/Makefile
+++ b/distrib/i386/ramdiskC/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/04/30 03:23:57 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdiskA
 RAMDISK=RAMDISKC
@@ -7,5 +7,4 @@ NOBSDRD=1
 
 .include "${.CURDIR}/../common/Makefile.inc"
 
-CRUNCHCONFS+=	${.CURDIR}/crunch_local.conf
 LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/i386/ramdiskC/crunch_local.conf b/distrib/i386/ramdiskC/crunch_local.conf
deleted file mode 100644
index cf709067308..00000000000
--- a/distrib/i386/ramdiskC/crunch_local.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: crunch_local.conf,v 1.1 2002/04/22 02:40:03 deraadt Exp $
-
-# Include wicontrol and ancontrol for wireless installs
-progs wicontrol ancontrol
diff --git a/distrib/i386/ramdiskC/list.local b/distrib/i386/ramdiskC/list.local
index 7e2b3e1e66a..7ea1a41e36a 100644
--- a/distrib/i386/ramdiskC/list.local
+++ b/distrib/i386/ramdiskC/list.local
@@ -1,5 +1,5 @@
-# $OpenBSD: list.local,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+# $OpenBSD: list.local,v 1.2 2002/04/30 03:23:57 deraadt Exp $
 
-# add local links; use bin/sh since instbin has already been unlinked
-LINK	bin/sh		sbin/wicontrol
-LINK	bin/sh		sbin/ancontrol
+# add local links; use instbin since instbin has already been unlinked
+LINK	instbin					sbin/wicontrol
+LINK	instbin					sbin/ancontrol
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index f9356fb162e..4dfc4e1ac63 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/04/30 03:23:57 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISK_CD
@@ -9,5 +9,4 @@ FLOPPYSECS=36
 
 .include "${.CURDIR}/../common/Makefile.inc"
 
-CRUNCHCONFS+=	${.CURDIR}/crunch_local.conf
 LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/i386/ramdisk_cd/crunch_local.conf b/distrib/i386/ramdisk_cd/crunch_local.conf
deleted file mode 100644
index cf709067308..00000000000
--- a/distrib/i386/ramdisk_cd/crunch_local.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: crunch_local.conf,v 1.1 2002/04/22 02:40:03 deraadt Exp $
-
-# Include wicontrol and ancontrol for wireless installs
-progs wicontrol ancontrol
diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index 7e2b3e1e66a..a41a2766e71 100644
--- a/distrib/i386/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -1,5 +1,5 @@
-# $OpenBSD: list.local,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+# $OpenBSD: list.local,v 1.2 2002/04/30 03:23:57 deraadt Exp $
 
 # add local links; use bin/sh since instbin has already been unlinked
-LINK	bin/sh		sbin/wicontrol
-LINK	bin/sh		sbin/ancontrol
+LINK	instbin					sbin/wicontrol
+LINK	instbin					sbin/ancontrol