From 96b90741d049e554ef902372eb06b7200ed28572 Mon Sep 17 00:00:00 2001 From: Thorsten Lockert Date: Sun, 22 Sep 1996 20:20:50 +0000 Subject: Remove gzip from many install floppies; not needed with zlib part of pax/tar --- distrib/amiga/floppies/inst-common/instbin.conf | 7 +++---- distrib/amiga/floppies/inst-common/list | 5 +---- distrib/arm32/floppies/inst-common/instbin.conf | 5 ++--- distrib/arm32/floppies/inst-common/list | 3 --- distrib/atari/inst-common/instbin.conf | 5 ++--- distrib/atari/inst-common/list | 3 --- distrib/hp300/miniroot/inst-common/instbin.conf | 5 ++--- distrib/hp300/miniroot/inst-common/list | 3 --- distrib/i386/floppies/inst-common/instbin.conf | 7 +++---- distrib/i386/floppies/inst-common/list | 5 +---- distrib/sparc/floppies/inst-common/instbin.conf | 7 +++---- distrib/sparc/floppies/inst-common/list | 5 +---- distrib/vax/inst-common/instbin.conf | 7 +++---- distrib/vax/inst-common/list | 5 +---- 14 files changed, 22 insertions(+), 50 deletions(-) diff --git a/distrib/amiga/floppies/inst-common/instbin.conf b/distrib/amiga/floppies/inst-common/instbin.conf index 8ae488e4de6..97c50cda510 100644 --- a/distrib/amiga/floppies/inst-common/instbin.conf +++ b/distrib/amiga/floppies/inst-common/instbin.conf @@ -1,18 +1,17 @@ # # kcbin.conf - unified binary for the kc floppy -# $OpenBSD: instbin.conf,v 1.3 1996/06/29 05:54:06 tholo Exp $ +# $OpenBSD: instbin.conf,v 1.4 1996/09/22 20:20:43 tholo Exp $ # srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp -progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660 +progs ifconfig init ln ls mkdir mknod more mount mount_cd9660 progs mount_ados mount_ffs mount_nfs mv newfs pax printf pppd pwd reboot rm progs route sed sh shutdown slattach strings stty sync test tip progs umount update ln chown chgrp -ln gzip gzcat gunzip ln mount_ados ados ln mount_cd9660 cd9660 ln mount_ffs ffs @@ -22,4 +21,4 @@ ln reboot halt ln sh -sh # init invokes the shell this way ln test [ -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list index 685be8ca480..6e2d17da4fd 100644 --- a/distrib/amiga/floppies/inst-common/list +++ b/distrib/amiga/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.5 1996/06/29 05:54:06 tholo Exp $ +# $OpenBSD: list,v 1.6 1996/09/22 20:20:43 tholo Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -41,9 +41,6 @@ LINK instbin sbin/slattach LINK instbin sbin/umount LINK instbin usr/bin/chgrp LINK instbin usr/bin/ftp -LINK instbin usr/bin/gunzip -LINK instbin usr/bin/gzcat -LINK instbin usr/bin/gzip LINK instbin usr/bin/more LINK instbin usr/bin/printf LINK instbin usr/bin/sed diff --git a/distrib/arm32/floppies/inst-common/instbin.conf b/distrib/arm32/floppies/inst-common/instbin.conf index dbeac1091bd..26062b9d9b3 100644 --- a/distrib/arm32/floppies/inst-common/instbin.conf +++ b/distrib/arm32/floppies/inst-common/instbin.conf @@ -5,7 +5,7 @@ srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin progs cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs ftp gawk grep -progs gzip ifconfig init less ln ls mkdir mknod mount mount_cd9660 +progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs progs mv newfs ping printf pwd reboot rm route progs sed sh shutdown slattach strings stty sync tar test tip umount @@ -15,7 +15,6 @@ ln chown chgrp ln fsck_ffs fsck ln gawk awk ln grep egrep -ln gzip gzcat gunzip ln sh -sh # init invokes the shell this way ln test [ ln mount_cd9660 cd9660 @@ -26,4 +25,4 @@ ln mount_kernfs kernfs ln less more ln reboot halt -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm diff --git a/distrib/arm32/floppies/inst-common/list b/distrib/arm32/floppies/inst-common/list index 3075cf8e347..5acb4972a3e 100644 --- a/distrib/arm32/floppies/inst-common/list +++ b/distrib/arm32/floppies/inst-common/list @@ -46,9 +46,6 @@ SYMLINK /bin/cat usr/bin/cksum SYMLINK /bin/cat usr/bin/cmp SYMLINK /bin/cat usr/bin/cut SYMLINK /bin/cat usr/bin/ftp -SYMLINK /bin/cat usr/bin/gunzip -SYMLINK /bin/cat usr/bin/gzcat -SYMLINK /bin/cat usr/bin/gzip SYMLINK /bin/cat usr/bin/grep SYMLINK /bin/cat usr/bin/more SYMLINK /bin/cat usr/bin/printf diff --git a/distrib/atari/inst-common/instbin.conf b/distrib/atari/inst-common/instbin.conf index 17c4aaa4ff2..948f99b3505 100644 --- a/distrib/atari/inst-common/instbin.conf +++ b/distrib/atari/inst-common/instbin.conf @@ -8,12 +8,11 @@ srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin srcdirs /usr/src/gnu/usr.bin progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp -progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660 +progs ifconfig init ln ls mkdir mknod more mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mv newfs printf pwd reboot rm route sed progs sh shutdown slattach strings stty sync tar test tip umount update ln chown chgrp -ln gzip gzcat gunzip ln reboot halt ln sh -sh # init invokes the shell this way ln test [ @@ -22,4 +21,4 @@ ln mount_msdos msdos ln mount_nfs nfs ln mount_cd9660 cd9660 -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm diff --git a/distrib/atari/inst-common/list b/distrib/atari/inst-common/list index eacdf29338b..e866db932f8 100644 --- a/distrib/atari/inst-common/list +++ b/distrib/atari/inst-common/list @@ -42,9 +42,6 @@ LINK instbin sbin/slattach LINK instbin sbin/umount LINK instbin usr/bin/chgrp LINK instbin usr/bin/ftp -LINK instbin usr/bin/gunzip -LINK instbin usr/bin/gzcat -LINK instbin usr/bin/gzip LINK instbin usr/bin/more LINK instbin usr/bin/printf LINK instbin usr/bin/sed diff --git a/distrib/hp300/miniroot/inst-common/instbin.conf b/distrib/hp300/miniroot/inst-common/instbin.conf index a956648388e..8b924a09819 100644 --- a/distrib/hp300/miniroot/inst-common/instbin.conf +++ b/distrib/hp300/miniroot/inst-common/instbin.conf @@ -5,7 +5,7 @@ srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin usr.bin/vi progs basename cat cut chflags chmod chown chroot cp dd df disklabel -progs dmesg ed expr fsck ftp gawk grep gzip hostname ifconfig init kill ln ls +progs dmesg ed expr fsck ftp gawk grep hostname ifconfig init kill ln ls progs mkdir mknod more mount mount_cd9660 mount_ffs mount_nfs mt mv newfs progs netstat pax ping pwd reboot rm route rsh sed sh shutdown slattach sleep progs sort strings stty sync test tip tset umount update @@ -15,7 +15,6 @@ progs common ln chown chgrp ln gawk awk -ln gzip gzcat gunzip ln pax tar ln sh -sh # init invokes the shell this way ln test [ @@ -25,4 +24,4 @@ ln mount_nfs nfs ln reboot halt ln common vi # XXX catch vi; see above -libs -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lkvm +libs -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lz -lm -lkvm diff --git a/distrib/hp300/miniroot/inst-common/list b/distrib/hp300/miniroot/inst-common/list index dc062bc4ce8..58912444675 100644 --- a/distrib/hp300/miniroot/inst-common/list +++ b/distrib/hp300/miniroot/inst-common/list @@ -50,9 +50,6 @@ SYMLINK /instbin usr/bin/chgrp SYMLINK /instbin usr/bin/cut SYMLINK /instbin usr/bin/ftp SYMLINK /instbin usr/bin/grep -SYMLINK /instbin usr/bin/gunzip -SYMLINK /instbin usr/bin/gzcat -SYMLINK /instbin usr/bin/gzip SYMLINK /instbin usr/bin/more SYMLINK /instbin usr/bin/netstat SYMLINK /instbin usr/bin/rsh diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf index 5f05761ea61..17a9a1823f3 100644 --- a/distrib/i386/floppies/inst-common/instbin.conf +++ b/distrib/i386/floppies/inst-common/instbin.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin.conf,v 1.9 1996/07/18 00:11:35 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.10 1996/09/22 20:20:47 tholo Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # @@ -6,18 +6,17 @@ srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs ftp awk -progs gzip ifconfig init less ln ls mkdir mknod mount mount_cd9660 +progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs progs mv newfs pax ping pwd reboot rm route progs sed sh shutdown slattach strings stty sync test tip umount ln chown chgrp ln fsck_ffs fsck -ln gzip gzcat gunzip ln less more ln pax tar ln sh -sh # init invokes the shell this way ln test [ ln reboot halt -libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lm +libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lz -lm diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list index 4ca39313f58..0abbbe1f8dc 100644 --- a/distrib/i386/floppies/inst-common/list +++ b/distrib/i386/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.6 1996/06/29 05:54:14 tholo Exp $ +# $Id: list,v 1.7 1996/09/22 20:20:47 tholo Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -43,9 +43,6 @@ LINK instbin sbin/umount SYMLINK /bin/cat usr/bin/awk SYMLINK /bin/cat usr/bin/chgrp SYMLINK /bin/cat usr/bin/ftp -SYMLINK /bin/cat usr/bin/gunzip -SYMLINK /bin/cat usr/bin/gzcat -SYMLINK /bin/cat usr/bin/gzip SYMLINK /bin/cat usr/bin/less SYMLINK /bin/cat usr/bin/sed SYMLINK /bin/cat usr/bin/strings diff --git a/distrib/sparc/floppies/inst-common/instbin.conf b/distrib/sparc/floppies/inst-common/instbin.conf index d149342f7bb..1708c46d432 100644 --- a/distrib/sparc/floppies/inst-common/instbin.conf +++ b/distrib/sparc/floppies/inst-common/instbin.conf @@ -1,19 +1,18 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.2 1996/06/29 05:54:24 tholo Exp $ +# $Id: instbin.conf,v 1.3 1996/09/22 20:20:48 tholo Exp $ # srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck ftp gawk -progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660 +progs ifconfig init ln ls mkdir mknod more mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mv newfs pax ping pwd reboot rm route progs sed sh shutdown slattach strings stty sync test tip umount progs update ln chown chgrp ln gawk awk -ln gzip gzcat gunzip ln pax tar ln sh -sh # init invokes the shell this way ln test [ @@ -23,4 +22,4 @@ ln mount_msdos msdos ln mount_nfs nfs ln reboot halt -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm diff --git a/distrib/sparc/floppies/inst-common/list b/distrib/sparc/floppies/inst-common/list index 9fdceb6e215..c8746ba5ab9 100644 --- a/distrib/sparc/floppies/inst-common/list +++ b/distrib/sparc/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1996/06/29 05:54:25 tholo Exp $ +# $Id: list,v 1.3 1996/09/22 20:20:48 tholo Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -42,9 +42,6 @@ LINK instbin sbin/umount SYMLINK /bin/cat usr/bin/awk SYMLINK /bin/cat usr/bin/chgrp SYMLINK /bin/cat usr/bin/ftp -SYMLINK /bin/cat usr/bin/gunzip -SYMLINK /bin/cat usr/bin/gzcat -SYMLINK /bin/cat usr/bin/gzip SYMLINK /bin/cat usr/bin/more SYMLINK /bin/cat usr/bin/sed SYMLINK /bin/cat usr/bin/strings diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf index 6361d535e2f..4d012623c06 100644 --- a/distrib/vax/inst-common/instbin.conf +++ b/distrib/vax/inst-common/instbin.conf @@ -1,18 +1,17 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.3 1996/09/05 21:27:37 deraadt Exp $ +# $Id: instbin.conf,v 1.4 1996/09/22 20:20:49 tholo Exp $ # srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin srcdirs /usr/src/gnu/usr.bin progs gawk cat chmod chown chroot cp df disklabel ed expr fsck ftp -progs gzip ifconfig init ln ls mkdir mknod more mount mt dd +progs ifconfig init ln ls mkdir mknod more mount mt dd progs mount_ffs mount_nfs mv newfs reboot rm route sed sh shutdown progs slattach strings stty sync tar test umount update ln chown chgrp -ln gzip gzcat gunzip ln mount_ffs ffs ln mount_nfs nfs ln gawk awk @@ -20,4 +19,4 @@ ln sh -sh # init invokes the shell this way ln test [ ln reboot halt -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list index 6a701bfbcd0..a3e08f12706 100644 --- a/distrib/vax/inst-common/list +++ b/distrib/vax/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.4 1996/09/05 21:27:38 deraadt Exp $ +# $Id: list,v 1.5 1996/09/22 20:20:49 tholo Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -39,9 +39,6 @@ LINK instbin sbin/umount LINK instbin usr/bin/awk LINK instbin usr/bin/chgrp LINK instbin usr/bin/ftp -LINK instbin usr/bin/gunzip -LINK instbin usr/bin/gzcat -LINK instbin usr/bin/gzip LINK instbin usr/bin/more LINK instbin usr/bin/sed LINK instbin usr/bin/strings -- cgit v1.2.3