From fa0f27fb2d83a92cc174cdae26e30ab2730e4ddc Mon Sep 17 00:00:00 2001 From: cgd Date: Tue, 18 Oct 1994 21:21:34 +0000 Subject: [PATCH] put dd on install & kc disks, as requested by John Kohl in pr 472, and make sure the .o's are made (e.g. after clean), as proposed by Rafal Boni in pr 493. --- distrib/i386/floppies/inst-common/Makefile.inc | 4 ++-- distrib/i386/floppies/inst-common/instbin.conf | 4 ++-- distrib/i386/floppies/inst-common/list | 3 ++- distrib/i386/floppies/kc-common/Makefile.inc | 4 ++-- distrib/i386/floppies/kc-common/kcbin.conf | 4 ++-- distrib/i386/floppies/kc-common/list | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc index 4a70bf6774d6..099de672a051 100644 --- a/distrib/i386/floppies/inst-common/Makefile.inc +++ b/distrib/i386/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.1.1.1 1994/08/29 15:30:23 cgd Exp $ +# $Id: Makefile.inc,v 1.2 1994/10/18 21:21:34 cgd Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -40,7 +40,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk + make -f ${CBIN}.mk all clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf index 1e7c1a6eeebd..bb5a054d92f8 100644 --- a/distrib/i386/floppies/inst-common/instbin.conf +++ b/distrib/i386/floppies/inst-common/instbin.conf @@ -1,12 +1,12 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.1.1.1 1994/08/29 15:30:22 cgd Exp $ +# $Id: instbin.conf,v 1.2 1994/10/18 21:21:37 cgd Exp $ # srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin srcdirs /usr/src/gnu/usr.bin -progs bad144 cat chmod chown chroot cp df disklabel ed expr fsck ftp gawk +progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck ftp gawk progs gzip ifconfig init halt ln ls mkdir mknod more mount mount_cd9660 progs mount_msdos mount_nfs mv newfs ping pwd reboot rm route sed sh progs shutdown slattach strings stty sync tar test tip umount update diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list index 70774ce6f94f..0d0d272432f4 100644 --- a/distrib/i386/floppies/inst-common/list +++ b/distrib/i386/floppies/inst-common/list @@ -1,10 +1,11 @@ -# $Id: list,v 1.2 1994/10/18 07:03:09 glass Exp $ +# $Id: list,v 1.3 1994/10/18 21:21:39 cgd Exp $ # 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/cp +LINK instbin bin/dd LINK instbin bin/df LINK instbin bin/ed LINK instbin bin/expr diff --git a/distrib/i386/floppies/kc-common/Makefile.inc b/distrib/i386/floppies/kc-common/Makefile.inc index ca95c5d2e1b9..9b10da076ac4 100644 --- a/distrib/i386/floppies/kc-common/Makefile.inc +++ b/distrib/i386/floppies/kc-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.1.1.1 1994/08/29 15:30:16 cgd Exp $ +# $Id: Makefile.inc,v 1.2 1994/10/18 21:21:48 cgd Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -41,7 +41,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk + make -f ${CBIN}.mk all clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c diff --git a/distrib/i386/floppies/kc-common/kcbin.conf b/distrib/i386/floppies/kc-common/kcbin.conf index dce3917eacaa..a2b89e7ded04 100644 --- a/distrib/i386/floppies/kc-common/kcbin.conf +++ b/distrib/i386/floppies/kc-common/kcbin.conf @@ -1,11 +1,11 @@ # # kcbin.conf - unified binary for the kc floppy -# $Id: kcbin.conf,v 1.1.1.1 1994/08/29 15:30:15 cgd Exp $ +# $Id: kcbin.conf,v 1.2 1994/10/18 21:21:51 cgd Exp $ # srcdirs /usr/src/bin /usr/src/sbin -progs cp disklabel fsck halt init mount reboot sh test umount +progs cp dd disklabel fsck halt init mount reboot sh test umount ln test [ ln sh -sh # init invokes the shell this way diff --git a/distrib/i386/floppies/kc-common/list b/distrib/i386/floppies/kc-common/list index df3e9c2daac9..38639c0eb9f8 100644 --- a/distrib/i386/floppies/kc-common/list +++ b/distrib/i386/floppies/kc-common/list @@ -1,8 +1,9 @@ -# $Id: list,v 1.1.1.1 1994/08/29 15:30:15 cgd Exp $ +# $Id: list,v 1.2 1994/10/18 21:21:53 cgd Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/kcbin kcbin LINK kcbin bin/cp +LINK kcbin bin/dd LINK kcbin bin/sh LINK kcbin bin/test LINK kcbin bin/[