Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/etc Pull up following revision(s) (requested by tsutsui i...



details:   https://anonhg.NetBSD.org/src/rev/2fe320b12d56
branches:  netbsd-6
changeset: 774262:2fe320b12d56
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jun 28 04:48:25 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #358):
        etc/MAKEDEV.tmpl: revision 1.156
Invoke MAKEDEV.local via $HOST_SH (default ${HOST_SH:=sh}) instead of
hardcoded "sh" to avoid unexpected errors on cross build hosts in
src/distrib/common/Makefile.makedev etc.
Should fix PR toolchain/46537, ok apb@

diffstat:

 etc/MAKEDEV.tmpl |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 674e2007171b -r 2fe320b12d56 etc/MAKEDEV.tmpl
--- a/etc/MAKEDEV.tmpl  Tue Jun 26 15:00:52 2012 +0000
+++ b/etc/MAKEDEV.tmpl  Thu Jun 28 04:48:25 2012 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: MAKEDEV.tmpl,v 1.151.2.2 2012/05/30 08:06:26 sborrill Exp $
+#      $NetBSD: MAKEDEV.tmpl,v 1.151.2.3 2012/06/28 04:48:25 riz Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -421,6 +421,7 @@
 {
        PATH=/sbin:/usr/sbin:/bin:/usr/bin:/rescue
 
+       : ${HOST_SH:=sh}
        : ${TOOL_MKNOD:=mknod}
        : ${TOOL_MTREE:=mtree}
        : ${TOOL_PAX:=pax}
@@ -2099,9 +2100,9 @@
                umask 0
                if [ -n "$count_nodes" ]; then
                        count_nodes=$((count_nodes + \
-                           $(linecount "$(sh "$0.local" $opts -s all)") ))
+                           $(linecount "$("$HOST_SH" "$0.local" $opts -s all)") ))
                else
-                       sh "$0.local" $opts all
+                       "$HOST_SH" "$0.local" $opts all
                fi
                umask 077
        fi



Home | Main Index | Thread Index | Old Index