Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/mac68k/miniroot Stop trying to include grep in the m...
details: https://anonhg.NetBSD.org/src/rev/399f67cf8789
branches: trunk
changeset: 543988:399f67cf8789
user: he <he%NetBSD.org@localhost>
date: Fri Mar 07 16:57:46 2003 +0000
description:
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).
diffstat:
distrib/mac68k/miniroot/install.md | 10 +++++-----
distrib/mac68k/miniroot/list | 6 ++----
2 files changed, 7 insertions(+), 9 deletions(-)
diffs (60 lines):
diff -r c1d8f0660f31 -r 399f67cf8789 distrib/mac68k/miniroot/install.md
--- a/distrib/mac68k/miniroot/install.md Fri Mar 07 16:29:33 2003 +0000
+++ b/distrib/mac68k/miniroot/install.md Fri Mar 07 16:57:46 2003 +0000
@@ -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 @@
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() {
diff -r c1d8f0660f31 -r 399f67cf8789 distrib/mac68k/miniroot/list
--- a/distrib/mac68k/miniroot/list Fri Mar 07 16:29:33 2003 +0000
+++ b/distrib/mac68k/miniroot/list Fri Mar 07 16:57:46 2003 +0000
@@ -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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index