From 98b901eee94fdcb889eaed4495da2baf6e132312 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 3 Apr 2001 13:43:25 +0000 Subject: [PATCH] Cleanup: sort by directory/program, remove unused libraries. --- release/alpha/boot_crunch.conf | 36 +++++++++++++++------------- release/amd64/boot_crunch.conf | 36 +++++++++++++++------------- release/amd64/fixit_crunch.conf | 42 ++++++++++----------------------- release/boot_crunch.conf | 36 +++++++++++++++------------- release/i386/boot_crunch.conf | 36 +++++++++++++++------------- release/i386/fixit_crunch.conf | 42 ++++++++++----------------------- release/pc98/boot_crunch.conf | 36 +++++++++++++++------------- release/pc98/fixit_crunch.conf | 42 ++++++++++----------------------- 8 files changed, 139 insertions(+), 167 deletions(-) diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf index 34e80a102c39..8c126a7d34ff 100644 --- a/release/alpha/boot_crunch.conf +++ b/release/alpha/boot_crunch.conf @@ -2,25 +2,29 @@ buildopts -DRELEASE_CRUNCH -srcdirs /usr/src/bin /usr/src/sbin /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 [ -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck fsck_4.2bsd ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs rtsol -progs pccardc pccardd -progs usbd usbdevs -progs tunefs +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 +ln newfs mount_mfs + +srcdirs /usr/src/usr.bin +progs find minigzip sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs + +srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +progs arp pccardc pccardd ppp +progs sysinstall usbd usbdevs libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -ldisk -lipx +libs -ldialog -lncurses -ldisk -lipx diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf index 34e80a102c39..8c126a7d34ff 100644 --- a/release/amd64/boot_crunch.conf +++ b/release/amd64/boot_crunch.conf @@ -2,25 +2,29 @@ buildopts -DRELEASE_CRUNCH -srcdirs /usr/src/bin /usr/src/sbin /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 [ -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck fsck_4.2bsd ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs rtsol -progs pccardc pccardd -progs usbd usbdevs -progs tunefs +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 +ln newfs mount_mfs + +srcdirs /usr/src/usr.bin +progs find minigzip sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs + +srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +progs arp pccardc pccardd ppp +progs sysinstall usbd usbdevs libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -ldisk -lipx +libs -ldialog -lncurses -ldisk -lipx diff --git a/release/amd64/fixit_crunch.conf b/release/amd64/fixit_crunch.conf index 795859572fb8..25d5aec91d39 100644 --- a/release/amd64/fixit_crunch.conf +++ b/release/amd64/fixit_crunch.conf @@ -2,39 +2,23 @@ buildopts -DRELEASE_CRUNCH -# first, we list the source dirs that our programs reside in. These are -# searched in order listed to find the dir containing each program. - -srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin -srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi -srcdirs /usr/src/sbin/i386 - -# second, we list all the programs we want to include in our crunched binary. -# The order doesn't matter. Any program that needs hard links to it gets an -# `ln' directive. - -# /bin stuff - -progs cat chmod chroot cp dd df echo expr kill ln ls mkdir -progs mv rm rmdir sleep sync - -# /sbin stuff - -progs chown clri disklabel dmesg fdisk -progs mknod mount reboot restore swapon umount - -progs mount_msdos mount_cd9660 +srcdirs /usr/src/bin +progs cat chmod cp dd df echo expr kill +progs ln ls mkdir mv rm rmdir sleep sync +srcdirs /usr/src/sbin /usr/src/sbin/i386 +progs clri disklabel dmesg fdisk mknod +progs mount mount_cd9660 mount_msdos +progs reboot restore swapon umount ln restore rrestore -ln chown chgrp -# /usr/bin stuff - -progs ftp telnet vi +srcdirs /usr/src/usr.bin +progs ftp telnet vi ln vi view ln vi ex -# finally, we specify the libraries to link in with our binary +srcdirs /usr/src/usr.sbin +progs chown chroot +ln chown chgrp -libs -lcrypt -lutil -ll -lm -libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz +libs -lutil -lm -lncurses -ltermcap -ledit -lkvm diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf index 34e80a102c39..8c126a7d34ff 100644 --- a/release/boot_crunch.conf +++ b/release/boot_crunch.conf @@ -2,25 +2,29 @@ buildopts -DRELEASE_CRUNCH -srcdirs /usr/src/bin /usr/src/sbin /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 [ -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck fsck_4.2bsd ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs rtsol -progs pccardc pccardd -progs usbd usbdevs -progs tunefs +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 +ln newfs mount_mfs + +srcdirs /usr/src/usr.bin +progs find minigzip sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs + +srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +progs arp pccardc pccardd ppp +progs sysinstall usbd usbdevs libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -ldisk -lipx +libs -ldialog -lncurses -ldisk -lipx diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf index 34e80a102c39..8c126a7d34ff 100644 --- a/release/i386/boot_crunch.conf +++ b/release/i386/boot_crunch.conf @@ -2,25 +2,29 @@ buildopts -DRELEASE_CRUNCH -srcdirs /usr/src/bin /usr/src/sbin /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 [ -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck fsck_4.2bsd ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs rtsol -progs pccardc pccardd -progs usbd usbdevs -progs tunefs +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 +ln newfs mount_mfs + +srcdirs /usr/src/usr.bin +progs find minigzip sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs + +srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +progs arp pccardc pccardd ppp +progs sysinstall usbd usbdevs libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -ldisk -lipx +libs -ldialog -lncurses -ldisk -lipx diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf index 795859572fb8..25d5aec91d39 100644 --- a/release/i386/fixit_crunch.conf +++ b/release/i386/fixit_crunch.conf @@ -2,39 +2,23 @@ buildopts -DRELEASE_CRUNCH -# first, we list the source dirs that our programs reside in. These are -# searched in order listed to find the dir containing each program. - -srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin -srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi -srcdirs /usr/src/sbin/i386 - -# second, we list all the programs we want to include in our crunched binary. -# The order doesn't matter. Any program that needs hard links to it gets an -# `ln' directive. - -# /bin stuff - -progs cat chmod chroot cp dd df echo expr kill ln ls mkdir -progs mv rm rmdir sleep sync - -# /sbin stuff - -progs chown clri disklabel dmesg fdisk -progs mknod mount reboot restore swapon umount - -progs mount_msdos mount_cd9660 +srcdirs /usr/src/bin +progs cat chmod cp dd df echo expr kill +progs ln ls mkdir mv rm rmdir sleep sync +srcdirs /usr/src/sbin /usr/src/sbin/i386 +progs clri disklabel dmesg fdisk mknod +progs mount mount_cd9660 mount_msdos +progs reboot restore swapon umount ln restore rrestore -ln chown chgrp -# /usr/bin stuff - -progs ftp telnet vi +srcdirs /usr/src/usr.bin +progs ftp telnet vi ln vi view ln vi ex -# finally, we specify the libraries to link in with our binary +srcdirs /usr/src/usr.sbin +progs chown chroot +ln chown chgrp -libs -lcrypt -lutil -ll -lm -libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz +libs -lutil -lm -lncurses -ltermcap -ledit -lkvm diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf index 34e80a102c39..8c126a7d34ff 100644 --- a/release/pc98/boot_crunch.conf +++ b/release/pc98/boot_crunch.conf @@ -2,25 +2,29 @@ buildopts -DRELEASE_CRUNCH -srcdirs /usr/src/bin /usr/src/sbin /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 [ -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck fsck_4.2bsd ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs rtsol -progs pccardc pccardd -progs usbd usbdevs -progs tunefs +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 +ln newfs mount_mfs + +srcdirs /usr/src/usr.bin +progs find minigzip sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs + +srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +progs arp pccardc pccardd ppp +progs sysinstall usbd usbdevs libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -ldisk -lipx +libs -ldialog -lncurses -ldisk -lipx diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf index c75058e2cc31..75f5f67e1ebc 100644 --- a/release/pc98/fixit_crunch.conf +++ b/release/pc98/fixit_crunch.conf @@ -2,39 +2,23 @@ buildopts -DRELEASE_CRUNCH -# first, we list the source dirs that our programs reside in. These are -# searched in order listed to find the dir containing each program. - -srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin -srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi -srcdirs /usr/src/sbin/pc98 - -# second, we list all the programs we want to include in our crunched binary. -# The order doesn't matter. Any program that needs hard links to it gets an -# `ln' directive. - -# /bin stuff - -progs cat chmod chroot cp dd df echo expr kill ln ls mkdir -progs mv rm rmdir sleep sync - -# /sbin stuff - -progs chown clri disklabel dmesg fdisk -progs mknod mount reboot restore swapon umount - -progs mount_msdos mount_cd9660 +srcdirs /usr/src/bin +progs cat chmod cp dd df echo expr kill +progs ln ls mkdir mv rm rmdir sleep sync +srcdirs /usr/src/sbin /usr/src/sbin/pc98 +progs clri disklabel dmesg fdisk mknod +progs mount mount_cd9660 mount_msdos +progs reboot restore swapon umount ln restore rrestore -ln chown chgrp -# /usr/bin stuff - -progs ftp telnet vi +srcdirs /usr/src/usr.bin +progs ftp telnet vi ln vi view ln vi ex -# finally, we specify the libraries to link in with our binary +srcdirs /usr/src/usr.sbin +progs chown chroot +ln chown chgrp -libs -lcrypt -lutil -ll -lm -libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz +libs -lutil -lm -lncurses -ltermcap -ledit -lkvm