summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2002-04-30 07:24:22 +0000
committerderaadt <deraadt@openbsd.org>2002-04-30 07:24:22 +0000
commitb56c0d1e3e95159b82f0ec902df209c6ac681d44 (patch)
treed367a53ad69001320c8ae04109bf9cf101454d1c
parentuse makeconf.awk, and cleanup instbin removal (diff)
downloadwireguard-openbsd-b56c0d1e3e95159b82f0ec902df209c6ac681d44.tar.xz
wireguard-openbsd-b56c0d1e3e95159b82f0ec902df209c6ac681d44.zip
first pass of instbin removal movement
-rw-r--r--distrib/miniroot/Makefile3
-rw-r--r--distrib/ramdisk/Makefile3
-rw-r--r--distrib/sparc/miniroot/list3
-rw-r--r--distrib/sparc/ramdisk/list3
4 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile
index 7f9325c869a..4d1eae95047 100644
--- a/distrib/miniroot/Makefile
+++ b/distrib/miniroot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2001/09/04 22:25:02 deraadt Exp $
+# $OpenBSD: Makefile,v 1.24 2002/04/30 07:24:22 deraadt Exp $
REV= ${OSrev}
@@ -48,6 +48,7 @@ all: ${CBIN} bsd
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \
TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${LISTS}
+ rm ${MOUNT_POINT}/${CBIN}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index c8e04c39011..8b8fcf9566d 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2002/04/28 18:28:34 deraadt Exp $
+# $OpenBSD: Makefile,v 1.22 2002/04/30 07:24:22 deraadt Exp $
REV= ${OSrev}
@@ -104,6 +104,7 @@ ${IMAGE}: ${CBIN}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \
TARGDIR=${MOUNT_POINT} UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS}
+ rm ${MOUNT_POINT}/${CBIN}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index 70dccfb130e..37216d57454 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.20 2002/04/30 04:05:49 deraadt Exp $
+# $OpenBSD: list,v 1.21 2002/04/30 07:24:22 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -8,7 +8,6 @@ LINK instbin usr/bin/cksum usr/bin/sum
LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
LINK instbin usr/bin/less usr/bin/more
LINK instbin usr/sbin/installboot
-SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sparc/stand
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 68838b97b4a..ba428082db4 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.17 2002/04/30 04:05:49 deraadt Exp $
+# $OpenBSD: list,v 1.18 2002/04/30 07:24:22 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -6,7 +6,6 @@ LINK instbin sbin/disklabel
LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
LINK instbin usr/bin/less usr/bin/more
LINK instbin usr/sbin/installboot
-SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sparc/stand