Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop trying to include grep in the miniroot, since this in grep's

Browse Source 
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:
he 2003-03-07 16:57:46 +00:00
parent c0e23f3152
commit cf13cdc4df
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/mac68k/miniroot/install.md
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -76,18 +76,18 @@ __mfs_failed_1
md_get_diskdevs() { md_get_diskdevs() {
# return available disk devices # 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() { md_get_cddevs() {
# return available CD-ROM devices # 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() { md_get_ifdevs() {
# return available network interfaces # return available network interfaces
dmesg | grep "^ae[0-9]*:" | cut -d":" -f1 | sort -u dmesg | awk -F : '/^ae[0-9]*:/ { print $1; }' | sort -u
dmesg | grep "^sn[0-9]*:" | cut -d":" -f1 | sort -u dmesg | awk -F : '/^sn[0-9]*:/ { print $1; }' | sort -u
} }
md_installboot() { md_installboot() {

6
distrib/mac68k/miniroot/list
View File

@ -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 # mac68k extra's
PROG sbin/dmesg PROG sbin/dmesg
PROG usr/bin/basename PROG usr/bin/basename
PROG usr/bin/cksum usr/bin/sum PROG usr/bin/cksum usr/bin/sum
PROG usr/bin/cut PROG usr/bin/gawk usr/bin/awk
PROG usr/bin/grep usr/bin/egrep usr/bin/fgrep
PROG usr/bin/netstat PROG usr/bin/netstat
PROG usr/bin/rsh PROG usr/bin/rsh
PROG usr/bin/tset usr/bin/reset PROG usr/bin/tset usr/bin/reset
@ -18,7 +17,6 @@ SYMLINK /bin/cat usr/bin/strings
# crunchgen source directory specials # crunchgen source directory specials
#SPECIAL vi srcdir usr.bin/vi/build #SPECIAL vi srcdir usr.bin/vi/build
SPECIAL less srcdir usr.bin/less/less SPECIAL less srcdir usr.bin/less/less
SPECIAL grep srcdir gnu/usr.bin/grep/grep
# Minimize use of MFS # Minimize use of MFS
SYMLINK /tmp var/tmp SYMLINK /tmp var/tmp