[src/netbsd-1-5]: src/sys/arch/sparc/stand "pull up" (via patch) fixes for sp...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/83680fa388d0
branches:  netbsd-1-5
changeset: 489247:83680fa388d0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 26 00:37:47 2000 +0000

description:
"pull up" (via patch) fixes for sparc64 vs sparc boot blocks.  (this is
resolved on the trunk with newvers_stand.sh).  approved by thorpej.

diffstat:

 sys/arch/sparc/stand/boot/Makefile     |  4 ++--
 sys/arch/sparc/stand/common/newvers.sh |  5 +++--
 sys/arch/sparc/stand/ofwboot/Makefile  |  4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 1a7a41667703 -r 83680fa388d0 sys/arch/sparc/stand/boot/Makefile
--- a/sys/arch/sparc/stand/boot/Makefile        Sat Aug 26 00:32:52 2000 +0000
+++ b/sys/arch/sparc/stand/boot/Makefile        Sat Aug 26 00:37:47 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2000/03/13 03:25:20 mycroft Exp $
+#      $NetBSD: Makefile,v 1.20.4.1 2000/08/26 00:37:47 mrg Exp $
 
 STRIPFLAG=
 PROGSOURCE=    boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c vers.c
@@ -25,7 +25,7 @@
 
 
 vers.c:
-       sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+       MACHINE=${MACHINE} sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 
 .for RELOC in ${RELOCS}
 boot.${RELOC}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
diff -r 1a7a41667703 -r 83680fa388d0 sys/arch/sparc/stand/common/newvers.sh
--- a/sys/arch/sparc/stand/common/newvers.sh    Sat Aug 26 00:32:52 2000 +0000
+++ b/sys/arch/sparc/stand/common/newvers.sh    Sat Aug 26 00:37:47 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: newvers.sh,v 1.2 1999/01/15 00:48:03 mrg Exp $
+#      $NetBSD: newvers.sh,v 1.2.18.1 2000/08/26 00:38:14 mrg Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -37,8 +37,9 @@
 
 u=${USER-root} h=`hostname` t=`date`
 r=`awk '/^Version:/ { print $2 } ' $1`
+m=${MACHINE-`sysctl -n hw.machine`}
 
-echo "char bootprog_name[] = \"NetBSD/sparc ${2}\";" > vers.c
+echo "char bootprog_name[] = \"NetBSD/${m} ${2}\";" > vers.c
 echo "char bootprog_rev[] = \"${r}\";" >> vers.c
 echo "char bootprog_date[] = \"${t}\";" >> vers.c
 echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
diff -r 1a7a41667703 -r 83680fa388d0 sys/arch/sparc/stand/ofwboot/Makefile
--- a/sys/arch/sparc/stand/ofwboot/Makefile     Sat Aug 26 00:32:52 2000 +0000
+++ b/sys/arch/sparc/stand/ofwboot/Makefile     Sat Aug 26 00:37:47 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.2 2000/08/26 00:05:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.1.2.3 2000/08/26 00:38:15 mrg Exp $
 
 CURDIR=        ${.CURDIR}
 S=     ${CURDIR}/../../../..
@@ -82,7 +82,7 @@
        ln -s ${.CURDIR}/../../../sparc/include sparc
 
 vers.c: version
-       sh ${.CURDIR}/../common/newvers.sh ${CURDIR}/version ${NEWVERSWHAT}
+       MACHINE=${MACHINE} sh ${.CURDIR}/../common/newvers.sh ${CURDIR}/version ${NEWVERSWHAT}
 
 .if CROSS
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}