diff options
author | peter <peter@FreeBSD.org> | 1999-06-29 21:23:26 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-06-29 21:23:26 +0000 |
commit | 8fd823677180cb1f7a19006e068f78c9bca9dcce (patch) | |
tree | a6f49a93946093cd333da8ed7ebd3c1d400c1994 /sys/boot/alpha | |
parent | b911e1234cfc8c0c6ed9e56aa95a1fd116673727 (diff) | |
download | FreeBSD-src-8fd823677180cb1f7a19006e068f78c9bca9dcce.zip FreeBSD-src-8fd823677180cb1f7a19006e068f78c9bca9dcce.tar.gz |
Reconcile all the loader newvers.sh's into one common one.
Diffstat (limited to 'sys/boot/alpha')
-rw-r--r-- | sys/boot/alpha/boot2/Makefile | 6 | ||||
-rw-r--r-- | sys/boot/alpha/boot2/newvers.sh | 46 | ||||
-rw-r--r-- | sys/boot/alpha/netboot/Makefile | 6 | ||||
-rw-r--r-- | sys/boot/alpha/netboot/newvers.sh | 45 |
4 files changed, 6 insertions, 97 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 |