diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-30 09:18:21 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-30 09:18:21 +0000 |
commit | 16d26a892445f1d54ace812fa19c782a6548797d (patch) | |
tree | 169d788b00b46f9b4d790efc16f6769ed1fe6947 /distrib/sparc64/bsd.rd | |
parent | 48931635f3e143c0bb18604c872300d0d7cd66fc (diff) |
use makeconf.awk throughout, delete instbin in Makefile
Diffstat (limited to 'distrib/sparc64/bsd.rd')
-rw-r--r-- | distrib/sparc64/bsd.rd/Makefile | 3 | ||||
-rw-r--r-- | distrib/sparc64/bsd.rd/instbin.conf | 32 | ||||
-rw-r--r-- | distrib/sparc64/bsd.rd/list | 3 |
3 files changed, 3 insertions, 35 deletions
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 668d05cd777..91914efcb24 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -130,6 +130,7 @@ do_files: 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/sparc64/bsd.rd/instbin.conf b/distrib/sparc64/bsd.rd/instbin.conf deleted file mode 100644 index 0a3ace7a277..00000000000 --- a/distrib/sparc64/bsd.rd/instbin.conf +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.1 2002/04/21 07:30:58 deraadt Exp $ -# -# instbin.conf - unified binary for the inst/upgr floppies -# - -srcdirs distrib/special -srcdirs gnu/usr.bin usr.bin bin sbin usr.sbin - -progs dd mount_cd9660 df dhclient mount sync restore -progs stty ln disklabel pax ping cat ifconfig dmesg ls -progs less mount_nfs grep umount rsh fsck -progs mknod route ftp mount_ffs reboot ed -progs cp gzip chmod fsck_ffs init newfs -progs tip rm mt mkdir sed ksh sleep -progs mv expr test hostname - -ln mt eject -ln chmod chgrp -ln chmod chown -ln pax tar -ln pax cpio -ln less more -ln grep fgrep -ln grep egrep -ln reboot halt -ln gzip gunzip -ln gzip gzcat -ln ksh sh -ln ksh -sh -ln test [ - -libs -ledit -lutil -lcurses -ll -lm -lkvm -lz -lkrb -ldes diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index 88d27f257ed..a2db49e6a90 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.10 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.11 2002/04/30 09:18:20 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -47,7 +47,6 @@ LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed -SPECIAL /bin/rm instbin ARGVLINK ksh -sh |