3 files changed, 31 insertions, 65 deletions

diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index 5039bd3a067f..1569a4828bf4 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -1,29 +1,24 @@
 # $FreeBSD$
 
-buildopts -DRELEASE_CRUNCH -Dlint
+srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
+srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
+srcdirs /usr/src/usr.sbin/pccard
 
-srcdirs /usr/src/bin
-progs hostname pwd rm sh test
-ln sh -sh
-ln test [
-
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
-srcdirs /usr/src/sbin
-progs dhclient fsck fsck_4.2bsd ifconfig
-progs mount_nfs newfs route rtsol
+progs sh find sed test rm
+progs pwd ppp
+progs sysinstall newfs minigzip cpio fsck ifconfig route slattach
+progs mount_nfs
+progs dhclient arp hostname
+progs rtsol
+progs pccardc pccardd
+progs usbd usbdevs
 progs tunefs
-
-srcdirs /usr/src/usr.bin
-progs find minigzip sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
-
-srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall
+ln sh -sh
+ln test [
+ln newfs mount_mfs
 
 libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk
+libs -ldialog -lncurses -lmytinfo -ldisk -lipx
diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf
deleted file mode 100644
index 1569a4828bf4..000000000000
--- a/release/boot_crunch.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
-srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
-srcdirs /usr/src/usr.sbin/pccard
-
-progs sh find sed test rm
-progs pwd ppp
-progs sysinstall newfs minigzip cpio fsck ifconfig route slattach
-progs mount_nfs
-progs dhclient arp hostname
-progs rtsol
-progs pccardc pccardd
-progs usbd usbdevs
-progs tunefs
-ln minigzip gzip
-ln minigzip gunzip
-ln minigzip zcat
-ln sh -sh
-ln test [
-ln newfs mount_mfs
-
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -lmytinfo -ldisk -lipx
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index f2d39dd14029..1569a4828bf4 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,29 +1,24 @@
 # $FreeBSD$
 
-buildopts -DRELEASE_CRUNCH -Dlint
+srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
+srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
+srcdirs /usr/src/usr.sbin/pccard
 
-srcdirs /usr/src/bin
-progs hostname pwd rm sh test
-ln sh -sh
-ln test [
-
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
-srcdirs /usr/src/sbin
-progs dhclient fsck fsck_4.2bsd ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs
-
-srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs sh find sed test rm
+progs pwd ppp
+progs sysinstall newfs minigzip cpio fsck ifconfig route slattach
+progs mount_nfs
+progs dhclient arp hostname
+progs rtsol
+progs pccardc pccardd
+progs usbd usbdevs
+progs tunefs
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
-
-srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard
-progs arp pccardc pccardd ppp
-progs sysinstall usbd usbdevs
+ln sh -sh
+ln test [
+ln newfs mount_mfs
 
 libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk
+libs -ldialog -lncurses -lmytinfo -ldisk -lipx