Reconcile all the loader newvers.sh's into one common one.

7 files changed, 15 insertions, 106 deletions

diff --git a/sys/boot/alpha/boot2/Makefile b/sys/boot/alpha/boot2/Makefile
index ab7d2ca..f11ce01 100644
--- a/sys/boot/alpha/boot2/Makefile
+++ b/sys/boot/alpha/boot2/Makefile
@@ -3,7 +3,7 @@
 BASE= 		loader
 PROG= 		${BASE}
 NOMAN=
-NEWVERSWHAT=	"SRM disk boot"
+NEWVERSWHAT=	"SRM disk boot" alpha
 
 .PATH:		${.CURDIR}/../common
 
@@ -34,8 +34,8 @@ BINDIR?=	/boot
 
 all: ${BASE}
 
-vers.o: ${.CURDIR}/newvers.sh ${.CURDIR}/Makefile
-	sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+vers.o: ${.CURDIR}/../../newvers.sh ${.CURDIR}/version
+	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
 ${BASE}: ${BASE}.sym ${BASE}.help
diff --git a/sys/boot/alpha/boot2/newvers.sh b/sys/boot/alpha/boot2/newvers.sh
deleted file mode 100644
index 2a78202..0000000
--- a/sys/boot/alpha/boot2/newvers.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -
-#
-#	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej 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
-
-LC_TIME=C; export LC_TIME
-u=${USER-root} h=`hostname` t=`date`
-#r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
-r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
-
-echo "char bootprog_name[] = \"FreeBSD/alpha ${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 --git a/sys/boot/alpha/netboot/Makefile b/sys/boot/alpha/netboot/Makefile
index 4643add..ebdb351 100644
--- a/sys/boot/alpha/netboot/Makefile
+++ b/sys/boot/alpha/netboot/Makefile
@@ -3,7 +3,7 @@
 BASE= 		netboot
 PROG= 		${BASE}
 NOMAN=
-NEWVERSWHAT=	"SRM net boot"
+NEWVERSWHAT=	"SRM net boot" alpha
 
 .PATH:		${.CURDIR}/../common
 
@@ -33,8 +33,8 @@ BINDIR?=	/boot
 
 all: ${BASE}
 
-vers.o: ${.CURDIR}/newvers.sh ${.CURDIR}/Makefile
-	sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
+	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
 ${BASE}: ${BASE}.sym
diff --git a/sys/boot/alpha/netboot/newvers.sh b/sys/boot/alpha/netboot/newvers.sh
deleted file mode 100644
index 42a459f..0000000
--- a/sys/boot/alpha/netboot/newvers.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -
-#
-#	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej 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 -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
-r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
-
-echo "char bootprog_name[] = \"FreeBSD/alpha ${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 --git a/sys/boot/i386/loader/newvers.sh b/sys/boot/common/newvers.sh
index 476913b..459f407 100755
--- a/sys/boot/i386/loader/newvers.sh
+++ b/sys/boot/common/newvers.sh
@@ -40,7 +40,7 @@ u=${USER-root} h=`hostname` t=`date`
 #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
 r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
 
-echo "char bootprog_name[] = \"FreeBSD/i386 ${2}\";" > vers.c
+echo "char bootprog_name[] = \"FreeBSD/${3} ${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 --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 07cb6b2..966d436 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.33 1999/04/24 17:25:35 dcs Exp $
+# $Id: Makefile,v 1.34 1999/04/24 17:49:47 dcs Exp $
 
 BASE=		loader
 PROG=		${BASE}
@@ -6,7 +6,7 @@ MAN5=		../../forth/loader.conf.5
 MAN8=		loader.8 ../../forth/loader.4th.8
 #NOMAN=
 STRIP=
-NEWVERSWHAT=	"bootstrap loader"
+NEWVERSWHAT=	"bootstrap loader" i386
 BINDIR?=	/boot
 
 # architecture-specific loader code
@@ -66,8 +66,8 @@ CFLAGS+=	-DNEW_LINKER_SET
 #CFLAGS+=	-g
 #LDFLAGS+=	-g
 
-vers.o:
-	sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+vers.o:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
+	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
 ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} ${BASE}.help
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 91504d2..e51a952 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1999/04/19 11:02:19 kato Exp $
+# $Id: Makefile,v 1.7 1999/04/25 03:56:44 kato Exp $
 
 BASE=		loader
 PROG=		${BASE}
@@ -6,7 +6,7 @@ MAN5=		../../forth/loader.conf.5
 MAN8=		../../i386/loader/loader.8 ../../forth/loader.4th.8
 #NOMAN=
 STRIP=
-NEWVERSWHAT=	"bootstrap loader"
+NEWVERSWHAT=	"bootstrap loader" pc98
 BINDIR?=	/boot
 
 CFLAGS+=	-DPC98
@@ -69,8 +69,8 @@ CFLAGS+=	-DNEW_LINKER_SET
 #CFLAGS+=	-g
 #LDFLAGS+=	-g
 
-vers.o:
-	sh ${.CURDIR}/../../i386/loader/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT}
+vers.o:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version
+	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
 ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} ${BASE}.help