summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2002-05-27 02:58:40 +0000
committerderaadt <deraadt@openbsd.org>2002-05-27 02:58:40 +0000
commitc6f5318093a694c4b45331cdc0aaecf9a528e0ce (patch)
tree21be0b026a253b5bfb59ed59c93f624991bf9483
parentkill unused arc4random_8() API (diff)
downloadwireguard-openbsd-c6f5318093a694c4b45331cdc0aaecf9a528e0ce.tar.xz
wireguard-openbsd-c6f5318093a694c4b45331cdc0aaecf9a528e0ce.zip
catch up to the new build methods
-rw-r--r--distrib/hp300/ramdisk/Makefile4
-rw-r--r--distrib/hp300/ramdisk/Makefile.inc7
-rw-r--r--distrib/hp300/ramdisk/list22
3 files changed, 17 insertions, 16 deletions
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index 8c36949968d..760c19b83d2 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2002/04/25 22:12:08 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2002/05/27 02:58:40 deraadt Exp $
# $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= ramdisk-${REV}.fs
-CRUNCHCONF?= ${.CURDIR}/${CBIN}.conf
+CRUNCHCONF?= ${CBIN}.conf
BASE= ramdisk
MOUNT_POINT= /mnt
diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc
index 4324c017647..52db259745b 100644
--- a/distrib/hp300/ramdisk/Makefile.inc
+++ b/distrib/hp300/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
#
-# $OpenBSD: Makefile.inc,v 1.5 2002/04/30 09:18:20 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2002/05/27 02:58:40 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
#
@@ -12,9 +12,12 @@ UTILS?= ${TOP}/../miniroot
MOUNT_POINT?= ${TOP}/${BASE}/fs
LISTS= ${.CURDIR}/list
-CRUNCHCONF?= ${COMMONDIR}/${CBIN}.conf
+CRUNCHCONF?= ${CBIN}.conf
MTREE= ${UTILS}/mtree.conf
+${CBIN}.conf: ${LISTS}
+ awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 972a3015dfb..60bae67cd7b 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,7 @@
-# $OpenBSD: list,v 1.33 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: list,v 1.34 2002/05/27 02:58:40 deraadt Exp $
+
+SRCDIRS distrib/special
+SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
@@ -14,7 +17,7 @@ LINK instbin bin/ls
LINK instbin bin/mkdir
LINK instbin bin/mv
LINK instbin bin/rm
-LINK instbin bin/sh
+LINK instbin bin/ksh bin/sh
LINK bin/sh bin/-sh
LINK instbin bin/sleep
LINK instbin bin/stty
@@ -22,29 +25,24 @@ LINK instbin bin/sync
LINK instbin sbin/disklabel
LINK instbin sbin/fsck_ffs 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/newfs sbin/mount_mfs
+LINK instbin sbin/reboot sbin/halt
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/grep usr/bin/egrep
LINK instbin usr/bin/gzip
-LINK instbin usr/bin/less
+LINK instbin usr/bin/less usr/bin/more
LINK instbin usr/bin/sed
LINK instbin usr/bin/sort
-LINK instbin bin/pax
-LINK instbin usr/bin/tar
+LINK instbin bin/pax usr/bin/tar
LINK instbin sbin/dhclient
# copy the MAKEDEV script and make some devices