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 | |
| parent | 48931635f3e143c0bb18604c872300d0d7cd66fc (diff) | |
use makeconf.awk throughout, delete instbin in Makefile
26 files changed, 127 insertions, 342 deletions
diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc index 76efa53291a..4324c017647 100644 --- a/distrib/hp300/ramdisk/Makefile.inc +++ b/distrib/hp300/ramdisk/Makefile.inc @@ -1,11 +1,11 @@ # -# $OpenBSD: Makefile.inc,v 1.4 2002/04/28 18:28:33 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2002/04/30 09:18:20 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= raminst +CBIN?= instbin COMMONDIR= ${TOP}/ramdisk UTILS?= ${TOP}/../miniroot @@ -26,6 +26,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 *.o *.lo *.c diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index c49f182d6c9..d725aef0380 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,52 +1,51 @@ -# $OpenBSD: list,v 1.30 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.31 2002/04/30 09:18:20 deraadt Exp $ -COPY ${OBJDIR}/raminst raminst -LINK raminst bin/cat -LINK raminst bin/chmod bin/chgrp sbin/chown -LINK raminst bin/cp -LINK raminst bin/df -LINK raminst bin/dd -LINK raminst bin/ed -LINK raminst bin/expr -LINK raminst bin/hostname -LINK raminst bin/ln -LINK raminst bin/ls -LINK raminst bin/mkdir -LINK raminst bin/mv -LINK raminst bin/rm -LINK raminst bin/sh +COPY ${OBJDIR}/instbin instbin +LINK instbin bin/cat +LINK instbin bin/chmod bin/chgrp sbin/chown +LINK instbin bin/cp +LINK instbin bin/df +LINK instbin bin/dd +LINK instbin bin/ed +LINK instbin bin/expr +LINK instbin bin/hostname +LINK instbin bin/ln +LINK instbin bin/ls +LINK instbin bin/mkdir +LINK instbin bin/mv +LINK instbin bin/rm +LINK instbin bin/sh LINK bin/sh bin/-sh -LINK raminst bin/sleep -LINK raminst bin/stty -LINK raminst bin/sync -LINK raminst sbin/disklabel -LINK raminst sbin/fsck -LINK raminst sbin/dmesg -LINK raminst sbin/halt -LINK raminst sbin/ifconfig -LINK raminst sbin/init -LINK raminst sbin/mknod -LINK raminst usr/bin/more -LINK raminst sbin/mount -LINK raminst sbin/mount_cd9660 -LINK raminst sbin/mount_ffs -LINK raminst sbin/mount_nfs -LINK raminst sbin/mount_mfs -LINK raminst sbin/newfs -LINK raminst sbin/reboot -LINK raminst sbin/route -LINK raminst sbin/umount -LINK raminst usr/bin/ftp -LINK raminst usr/bin/egrep -LINK raminst usr/bin/grep -LINK raminst usr/bin/gzip -LINK raminst usr/bin/less -LINK raminst usr/bin/sed -LINK raminst usr/bin/sort -LINK raminst bin/pax -LINK raminst usr/bin/tar -LINK raminst sbin/dhclient -SPECIAL /bin/rm raminst +LINK instbin bin/sleep +LINK instbin bin/stty +LINK instbin bin/sync +LINK instbin sbin/disklabel +LINK instbin sbin/fsck +LINK instbin sbin/dmesg +LINK instbin sbin/halt +LINK instbin sbin/ifconfig +LINK instbin sbin/init +LINK instbin sbin/mknod +LINK instbin usr/bin/more +LINK instbin sbin/mount +LINK instbin sbin/mount_cd9660 +LINK instbin sbin/mount_ffs +LINK instbin sbin/mount_nfs +LINK instbin sbin/mount_mfs +LINK instbin sbin/newfs +LINK instbin sbin/reboot +LINK instbin sbin/route +LINK instbin sbin/umount +LINK instbin usr/bin/ftp +LINK instbin usr/bin/egrep +LINK instbin usr/bin/grep +LINK instbin usr/bin/gzip +LINK instbin usr/bin/less +LINK instbin usr/bin/sed +LINK instbin usr/bin/sort +LINK instbin bin/pax +LINK instbin usr/bin/tar +LINK instbin sbin/dhclient # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/hp300/ramdisk/raminst.conf b/distrib/hp300/ramdisk/raminst.conf deleted file mode 100644 index 3a4e71431da..00000000000 --- a/distrib/hp300/ramdisk/raminst.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# $OpenBSD: raminst.conf,v 1.17 2002/04/22 02:40:30 deraadt Exp $ -# -# raminst.conf - unified binary for the RAM disk -# - -srcdirs distrib/special bin sbin usr.bin/less gnu/usr.bin usr.bin usr.sbin - -progs cat chmod cp dd df disklabel dhclient dmesg ed expr -progs fsck_ffs ftp hostname grep gzip ifconfig init less ln ls -progs mkdir mknod mount mount_cd9660 mount_ffs mount_nfs -progs mv newfs pax ksh ping reboot rm route -progs sed sleep sort stty sync umount restore - -ln pax tar -ln chmod chgrp -ln chmod chown -ln fsck_ffs fsck -ln ksh sh -ln ksh -sh # init invokes the shell this way -ln mount_ffs ffs -ln newfs mount_mfs -ln grep egrep -ln reboot halt -ln less more - -libs -ledit -lutil -lcurses -lcompat -lpcap -ll -lm diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile index 769e9491429..811ba01fcd0 100644 --- a/distrib/mac68k/ramdisk/Makefile +++ b/distrib/mac68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -91,6 +91,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}.conf ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc index 261aae7b996..38d6c82716f 100644 --- a/distrib/mac68k/ramdisk/Makefile.inc +++ b/distrib/mac68k/ramdisk/Makefile.inc @@ -1,11 +1,11 @@ # -# $OpenBSD: Makefile.inc,v 1.3 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/04/30 09:18:20 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= rmainst +CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -35,6 +35,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} + rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list index 4c1201e6a41..541013d1c6a 100644 --- a/distrib/mac68k/ramdisk/list +++ b/distrib/mac68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.14 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.15 2002/04/30 09:18:20 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -43,7 +43,6 @@ LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed -SPECIAL rm instbin # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 77ece42198b..1cf54e1587d 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/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 $ REV= ${OSrev} @@ -95,6 +95,7 @@ do_files: TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ sh ${TOP}/../miniroot/runlist.sh ${LISTS} + rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/macppc/ramdisk/instbin.conf b/distrib/macppc/ramdisk/instbin.conf deleted file mode 100644 index 48c02db96df..00000000000 --- a/distrib/macppc/ramdisk/instbin.conf +++ /dev/null @@ -1,33 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.5 2002/04/21 07:05:19 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 newfs_msdos -progs stty ln disklabel pax ping cat ifconfig dmesg ls -progs less mount_nfs pdisk fdisk grep umount mount_msdos rsh fsck -progs mknod route ftp mount_ffs reboot ed -progs cp gzip chmod fsck_ffs sort init newfs -progs tip rm mt mkdir sed ksh sleep -progs mv expr test hostname -progs wicontrol ancontrol - -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/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index 5ec1827ca73..8f436d05adf 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.14 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.15 2002/04/30 09:18:20 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -53,7 +53,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 # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index 8fc71a4f747..cafa0dbbebf 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -81,6 +81,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}.conf ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc index 46d9c440e1b..738b2cdc36a 100644 --- a/distrib/mvme68k/ramdisk/Makefile.inc +++ b/distrib/mvme68k/ramdisk/Makefile.inc @@ -1,11 +1,11 @@ # -# $OpenBSD: Makefile.inc,v 1.6 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2002/04/30 09:18:20 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= rmainst +CBIN?= instbin LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -36,6 +36,7 @@ do_files: TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ 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 *.o *.lo *.c diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index 86ca4e0a5a5..83e1c271821 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.21 2002/04/30 09:18:20 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -46,7 +46,6 @@ LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed -SPECIAL rm instbin # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc index bc0e38fe376..6e82441de90 100644 --- a/distrib/mvme88k/ramdisk/Makefile.inc +++ b/distrib/mvme88k/ramdisk/Makefile.inc @@ -1,10 +1,10 @@ # -# $OpenBSD: Makefile.inc,v 1.4 2002/04/30 07:35:52 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2002/04/30 09:18:20 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. -CBIN?= raminst +CBIN?= instbin COMMONDIR= ${TOP}/ramdisk UTILS?= ${TOP}/../miniroot diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index a62f1c33944..cee29e49fed 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,56 +1,56 @@ -# $OpenBSD: list,v 1.16 2002/04/30 07:35:52 deraadt Exp $ +# $OpenBSD: list,v 1.17 2002/04/30 09:18:20 deraadt Exp $ -COPY ${OBJDIR}/raminst raminst -LINK raminst bin/cat -LINK raminst bin/chmod bin/chgrp sbin/chown -LINK raminst bin/cp -LINK raminst bin/df -LINK raminst bin/dd -LINK raminst bin/ed -LINK raminst bin/expr -LINK raminst bin/ln -LINK raminst bin/ls -LINK raminst bin/kill -LINK raminst bin/hostname -LINK raminst bin/mkdir -LINK raminst bin/mt -LINK raminst bin/mv -LINK raminst bin/pwd -LINK raminst bin/rm -LINK raminst bin/sh +COPY ${OBJDIR}/instbin instbin +LINK instbin bin/cat +LINK instbin bin/chmod bin/chgrp sbin/chown +LINK instbin bin/cp +LINK instbin bin/df +LINK instbin bin/dd +LINK instbin bin/ed +LINK instbin bin/expr +LINK instbin bin/ln +LINK instbin bin/ls +LINK instbin bin/kill +LINK instbin bin/hostname +LINK instbin bin/mkdir +LINK instbin bin/mt +LINK instbin bin/mv +LINK instbin bin/pwd +LINK instbin bin/rm +LINK instbin bin/sh LINK bin/sh bin/-sh LINK bin/sh bin/bash -LINK raminst bin/stty -LINK raminst bin/sleep -LINK raminst bin/sync -LINK raminst bin/test -LINK raminst bin/pax bin/tar bin/cpio -LINK raminst bin/[ -LINK raminst sbin/disklabel -LINK raminst sbin/dmesg -LINK raminst sbin/fsck -LINK raminst sbin/halt -LINK raminst sbin/ifconfig -LINK raminst sbin/init -LINK raminst sbin/mknod -LINK raminst sbin/mount -LINK raminst sbin/mount_cd9660 -LINK raminst sbin/mount_ffs -LINK raminst sbin/mount_nfs -LINK raminst sbin/mount_mfs -LINK raminst sbin/newfs -LINK raminst sbin/reboot -LINK raminst sbin/route -LINK raminst sbin/umount -LINK raminst usr/bin/ftp -LINK raminst usr/bin/egrep -LINK raminst usr/bin/grep -LINK raminst usr/bin/gzip -LINK raminst usr/bin/more -LINK raminst usr/bin/less -LINK raminst usr/bin/sed -LINK raminst usr/bin/tar -LINK raminst usr/bin/pax +LINK instbin bin/stty +LINK instbin bin/sleep +LINK instbin bin/sync +LINK instbin bin/test +LINK instbin bin/pax bin/tar bin/cpio +LINK instbin bin/[ +LINK instbin sbin/disklabel +LINK instbin sbin/dmesg +LINK instbin sbin/fsck +LINK instbin sbin/halt +LINK instbin sbin/ifconfig +LINK instbin sbin/init +LINK instbin sbin/mknod +LINK instbin sbin/mount +LINK instbin sbin/mount_cd9660 +LINK instbin sbin/mount_ffs +LINK instbin sbin/mount_nfs +LINK instbin sbin/mount_mfs +LINK instbin sbin/newfs +LINK instbin sbin/reboot +LINK instbin sbin/route +LINK instbin sbin/umount +LINK instbin usr/bin/ftp +LINK instbin usr/bin/egrep +LINK instbin usr/bin/grep +LINK instbin usr/bin/gzip +LINK instbin usr/bin/more +LINK instbin usr/bin/less +LINK instbin usr/bin/sed +LINK instbin usr/bin/tar +LINK instbin usr/bin/pax # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/mvme88k/ramdisk/raminst.conf b/distrib/mvme88k/ramdisk/raminst.conf deleted file mode 100644 index 245eb33f9a8..00000000000 --- a/distrib/mvme88k/ramdisk/raminst.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -# $OpenBSD: raminst.conf,v 1.5 2001/10/02 01:08:11 deraadt Exp $ -# -# ram.conf - unified binary for the RAM disk -# - -srcdirs distrib/special -srcdirs gnu/usr.bin -srcdirs bin sbin usr.bin usr.sbin usr.bin/vi - -progs awk cat chmod cut cp dd df disklabel ed grep expr fsck_ffs ftp -progs gzip ifconfig init hostname kill ln ls mkdir mknod less mount -progs mount_cd9660 mount_ffs mount_msdos mount_nfs mt -progs mv newfs pwd reboot rm route sed sleep ksh slattach sort stty -progs sync pax test tip umount build - -ln build vi -ln pax tar -ln pax cpio -ln chmod chgrp -ln chmod chown -ln fsck_ffs fsck -ln less more -ln ksh sh -ln ksh -sh # init invokes the shell this way -ln test [ -ln reboot halt -ln grep egrep - -libs -lutil -lcurses -ll -lm -ltermlib diff --git a/distrib/mvmeppc/ramdisk/instbin.conf b/distrib/mvmeppc/ramdisk/instbin.conf deleted file mode 100644 index eea65567d12..00000000000 --- a/distrib/mvmeppc/ramdisk/instbin.conf +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.5 2002/04/21 17:14:17 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 newfs_msdos -progs stty ln disklabel pax ping cat ifconfig ls -progs less mount_nfs pdisk fdisk grep umount mount_msdos rsh fsck -progs mknod route ftp mount_ffs reboot ed -progs cp gzip chmod fsck_ffs sort 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/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 diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index 02bbcf0ff48..b1f38ea013c 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -95,6 +95,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/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 2be2c7d76a5..5032fb4fb7d 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -124,6 +124,7 @@ do_files: TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} ARCHDIR=${.CURDIR}/.. 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/ramdisk/instbin.conf b/distrib/sparc64/ramdisk/instbin.conf deleted file mode 100644 index a51701df3db..00000000000 --- a/distrib/sparc64/ramdisk/instbin.conf +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.4 2001/10/10 04:21:02 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 df mount sync restore -progs stty ln disklabel pax ping cat ifconfig dmesg ls -progs less grep umount fsck -progs mknod route ftp mount_ffs reboot ed -progs cp gzip chmod fsck_ffs init newfs -progs 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/ramdisk/list b/distrib/sparc64/ramdisk/list index c72bfe1349f..4a8b2ca96b4 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.15 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.16 2002/04/30 09:18:20 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -44,7 +44,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 diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 87f02e69bc7..35ec8264406 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/04/28 18:28:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2002/04/30 09:18:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -124,6 +124,7 @@ do_files: TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} ARCHDIR=${.CURDIR}/.. 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/ramdiskB/instbin.conf b/distrib/sparc64/ramdiskB/instbin.conf deleted file mode 100644 index 52cb5f54b5f..00000000000 --- a/distrib/sparc64/ramdiskB/instbin.conf +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.1 2001/10/10 04:21:02 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 df mount sync restore -progs stty ln disklabel pax ping cat ifconfig dmesg ls -progs less grep umount fsck -progs mknod route ftp mount_ffs reboot ed -progs cp gzip chmod fsck_ffs init newfs -progs 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/ramdiskB/list b/distrib/sparc64/ramdiskB/list index 03716f31bd9..072b2eb7f2b 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.11 2002/04/30 01:31:20 deraadt Exp $ +# $OpenBSD: list,v 1.12 2002/04/30 09:18:20 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -44,7 +44,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 |