[src/trunk]: src/sys/arch/alpha/stand now that boot.c does the bootstrap name...

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

details:   https://anonhg.NetBSD.org/src/rev/d8ed87b4eb39
branches:  trunk
changeset: 471595:d8ed87b4eb39
user:      cgd <cgd%NetBSD.org@localhost>
date:      Mon Apr 05 06:56:23 1999 +0000

description:
now that boot.c does the bootstrap name with a -D, the newvers scripts
are all the same, so eliminate the redundancy.  also, use mrg's
"Version:" trick to find the version rather than using the RCS ID.
(I must have been having a ... bad day.)  Also, bump boot and netboot
versions for all the changes that have been happening lately.

diffstat:

 sys/arch/alpha/stand/boot/Makefile        |   4 +-
 sys/arch/alpha/stand/boot/newvers.sh      |  44 -------------------------------
 sys/arch/alpha/stand/boot/version         |   8 ++++-
 sys/arch/alpha/stand/common/newvers.sh    |  43 ++++++++++++++++++++++++++++++
 sys/arch/alpha/stand/netboot/Makefile     |   4 +-
 sys/arch/alpha/stand/netboot/newvers.sh   |  44 -------------------------------
 sys/arch/alpha/stand/netboot/version      |   8 ++++-
 sys/arch/alpha/stand/ustarboot/Makefile   |   4 +-
 sys/arch/alpha/stand/ustarboot/newvers.sh |  44 -------------------------------
 sys/arch/alpha/stand/ustarboot/version    |   9 ++++-
 10 files changed, 70 insertions(+), 142 deletions(-)

diffs (297 lines):

diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/boot/Makefile
--- a/sys/arch/alpha/stand/boot/Makefile        Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/boot/Makefile        Mon Apr 05 06:56:23 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/04/05 06:42:14 cgd Exp $
+# $NetBSD: Makefile,v 1.26 1999/04/05 06:56:23 cgd Exp $
 
 PROG = boot
 
@@ -26,7 +26,7 @@
 .include "../Makefile.bootprogs"
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-       sh ${.CURDIR}/newvers.sh ${.CURDIR}/version
+       sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version
        ${COMPILE.c} vers.c
        ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
            ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/boot/newvers.sh
--- a/sys/arch/alpha/stand/boot/newvers.sh      Mon Apr 05 06:42:14 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh -
-#
-# $NetBSD: newvers.sh,v 1.4 1997/04/06 08:40:35 cgd Exp $
-#
-# Copyright (c) 1984, 1986, 1990, 1993
-#      The Regents of the University of California.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by the University of
-#      California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#      @(#)newvers.sh  8.1 (Berkeley) 4/20/94
-
-u=${USER-root} h=`hostname` t=`date`
-r=`head -1 $1 | awk ' { print $3 } '`
-
-echo "char bootprog_name[] = \"NetBSD/Alpha Secondary Boot\";" > 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 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/boot/version
--- a/sys/arch/alpha/stand/boot/version Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/boot/version Mon Apr 05 06:56:23 1999 +0000
@@ -1,4 +1,9 @@
-$NetBSD: version,v 1.9 1997/01/23 23:10:38 cgd Exp $
+$NetBSD: version,v 1.10 1999/04/05 06:56:23 cgd Exp $
+
+# The newvers.sh looks for the line below.  We use this method
+# rather than $3 of the dollar-NetBSD-dollar line above so that
+# this version can be on branch-files also.
+Version: 1.10
 
 1.1:   Initial version
 1.2:   don't forget the Id string!
@@ -12,3 +17,4 @@
 1.7:   Use libsa and libkern rather than building the objects locally.
 1.8:   Search for a kernel, if none specified.
 1.9:   Add support for gzipped kernels.
+1.10:  The Great Boot Block Cleanup of April 1999.
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/common/newvers.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/alpha/stand/common/newvers.sh    Mon Apr 05 06:56:23 1999 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh -
+#
+# $NetBSD: newvers.sh,v 1.1 1999/04/05 06:56:23 cgd Exp $
+#
+# Copyright (c) 1984, 1986, 1990, 1993
+#      The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by the University of
+#      California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#      @(#)newvers.sh  8.1 (Berkeley) 4/20/94
+
+u=${USER-root} h=`hostname` t=`date`
+r=`awk '/^Version:/ { print $2 } ' $1`
+
+echo "char bootprog_rev[] = \"${r}\";" > vers.c
+echo "char bootprog_date[] = \"${t}\";" >> vers.c
+echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/netboot/Makefile
--- a/sys/arch/alpha/stand/netboot/Makefile     Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/netboot/Makefile     Mon Apr 05 06:56:23 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1999/04/05 06:42:14 cgd Exp $
+# $NetBSD: Makefile,v 1.20 1999/04/05 06:56:23 cgd Exp $
 
 PROG = netboot
 
@@ -26,7 +26,7 @@
 .include "../Makefile.bootprogs"
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-       sh ${.CURDIR}/newvers.sh ${.CURDIR}/version
+       sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version
        ${COMPILE.c} vers.c
        ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
            ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/netboot/newvers.sh
--- a/sys/arch/alpha/stand/netboot/newvers.sh   Mon Apr 05 06:42:14 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh -
-#
-# $NetBSD: newvers.sh,v 1.2 1997/04/06 08:41:27 cgd Exp $
-#
-# Copyright (c) 1984, 1986, 1990, 1993
-#      The Regents of the University of California.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by the University of
-#      California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#      @(#)newvers.sh  8.1 (Berkeley) 4/20/94
-
-u=${USER-root} h=`hostname` t=`date`
-r=`head -1 $1 | awk ' { print $3 } '`
-
-echo "char bootprog_name[] = \"NetBSD/Alpha Network Boot\";" > 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 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/netboot/version
--- a/sys/arch/alpha/stand/netboot/version      Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/netboot/version      Mon Apr 05 06:56:23 1999 +0000
@@ -1,4 +1,9 @@
-$NetBSD: version,v 1.6 1997/01/23 23:10:41 cgd Exp $
+$NetBSD: version,v 1.7 1999/04/05 06:56:23 cgd Exp $
+
+# The newvers.sh looks for the line below.  We use this method
+# rather than $3 of the dollar-NetBSD-dollar line above so that
+# this version can be on branch-files also.
+Version: 1.7
 
 1.1:   Initial version
 1.2:   Cleaned and polished a bit
@@ -6,3 +11,4 @@
 1.4:   Allow ethernet address to be hardcoded with setnetbootinfo(8).
 1.5:   Search for a kernel, if none specified.
 1.6:   Add support for gzipped kernels.
+1.7:   The Great Boot Block Cleanup of April 1999.
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/ustarboot/Makefile
--- a/sys/arch/alpha/stand/ustarboot/Makefile   Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/ustarboot/Makefile   Mon Apr 05 06:56:23 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/04/05 06:42:15 cgd Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/05 06:56:24 cgd Exp $
 
 PROG = ustarboot
 
@@ -27,7 +27,7 @@
 .include "../Makefile.bootprogs"
 
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-       sh ${.CURDIR}/newvers.sh ${.CURDIR}/version
+       sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version
        ${COMPILE.c} vers.c
        ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
            ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
diff -r 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/ustarboot/newvers.sh
--- a/sys/arch/alpha/stand/ustarboot/newvers.sh Mon Apr 05 06:42:14 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh -
-#
-# $NetBSD: newvers.sh,v 1.1 1999/04/02 09:13:28 cgd Exp $
-#
-# Copyright (c) 1984, 1986, 1990, 1993
-#      The Regents of the University of California.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by the University of
-#      California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#      @(#)newvers.sh  8.1 (Berkeley) 4/20/94
-
-u=${USER-root} h=`hostname` t=`date`
-r=`head -1 $1 | awk ' { print $3 } '`
-
-echo "char bootprog_name[] = \"NetBSD/Alpha ustar Boot\";" > 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 629e447d14b2 -r d8ed87b4eb39 sys/arch/alpha/stand/ustarboot/version
--- a/sys/arch/alpha/stand/ustarboot/version    Mon Apr 05 06:42:14 1999 +0000
+++ b/sys/arch/alpha/stand/ustarboot/version    Mon Apr 05 06:56:23 1999 +0000
@@ -1,3 +1,8 @@
-$NetBSD: version,v 1.1 1999/04/02 09:13:29 cgd Exp $
+$NetBSD: version,v 1.2 1999/04/05 06:56:24 cgd Exp $
 
-1.1:   Initial version
+# The newvers.sh looks for the line below.  We use this method
+# rather than $3 of the dollar-NetBSD-dollar line above so that
+# this version can be on branch-files also.
+Version: 1.1
+
+1.1:   Initial version (part of The Great Boot Block Cleanup of April 1999).