Stop trying to include grep in the miniroot, since this in grep's
current incarnation causes a build failure for the miniroot. Use awk instead; this also eliminates the need to include "cut" in the mac68k miniroot. Reviewed by Scott Reynolds (except for the "cut" eviction).
This commit is contained in:
parent
c0e23f3152
commit
cf13cdc4df
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $NetBSD: install.md,v 1.2 1997/10/09 07:25:49 jtc Exp $
|
||||
# $NetBSD: install.md,v 1.3 2003/03/07 16:57:46 he Exp $
|
||||
#
|
||||
# Copyright (c) 1996 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
|
@ -76,18 +76,18 @@ __mfs_failed_1
|
|||
|
||||
md_get_diskdevs() {
|
||||
# return available disk devices
|
||||
dmesg | grep "^sd[0-9]*:.*cylinders" | cut -d":" -f1 | sort -u
|
||||
dmesg | awk -F : '/^sd[0-9]*:.*cylinders/ { print $1; }' | sort -u
|
||||
}
|
||||
|
||||
md_get_cddevs() {
|
||||
# return available CD-ROM devices
|
||||
dmesg | grep "cd[0-9]*:.*CD-ROM" | cut -d":" -f1 | sort -u
|
||||
dmesg | awk -F : '/cd[0-9]*:.*CD-ROM/ { print $1; }' | sort -u
|
||||
}
|
||||
|
||||
md_get_ifdevs() {
|
||||
# return available network interfaces
|
||||
dmesg | grep "^ae[0-9]*:" | cut -d":" -f1 | sort -u
|
||||
dmesg | grep "^sn[0-9]*:" | cut -d":" -f1 | sort -u
|
||||
dmesg | awk -F : '/^ae[0-9]*:/ { print $1; }' | sort -u
|
||||
dmesg | awk -F : '/^sn[0-9]*:/ { print $1; }' | sort -u
|
||||
}
|
||||
|
||||
md_installboot() {
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
# $NetBSD: list,v 1.5 2003/02/19 14:21:06 he Exp $
|
||||
# $NetBSD: list,v 1.6 2003/03/07 16:57:46 he Exp $
|
||||
|
||||
# mac68k extra's
|
||||
PROG sbin/dmesg
|
||||
|
||||
PROG usr/bin/basename
|
||||
PROG usr/bin/cksum usr/bin/sum
|
||||
PROG usr/bin/cut
|
||||
PROG usr/bin/grep usr/bin/egrep usr/bin/fgrep
|
||||
PROG usr/bin/gawk usr/bin/awk
|
||||
PROG usr/bin/netstat
|
||||
PROG usr/bin/rsh
|
||||
PROG usr/bin/tset usr/bin/reset
|
||||
|
@ -18,7 +17,6 @@ SYMLINK /bin/cat usr/bin/strings
|
|||
# crunchgen source directory specials
|
||||
#SPECIAL vi srcdir usr.bin/vi/build
|
||||
SPECIAL less srcdir usr.bin/less/less
|
||||
SPECIAL grep srcdir gnu/usr.bin/grep/grep
|
||||
|
||||
# Minimize use of MFS
|
||||
SYMLINK /tmp var/tmp
|
||||
|
|
Loading…
Reference in New Issue