Module Name: src
Committed By: martin
Date: Sat Oct 12 11:16:04 UTC 2024
Modified Files:
src/sys/conf [netbsd-10]: newvers.mk newvers.sh newvers_stand.mk
newvers_stand.sh
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #953):
sys/conf/newvers_stand.sh: revision 1.10
sys/conf/newvers.mk: revision 1.3
sys/conf/newvers.mk: revision 1.4
sys/conf/newvers.sh: revision 1.63
sys/conf/newvers.sh: revision 1.64
sys/conf/newvers_stand.mk: revision 1.5
Use ${TOOL_DATE} (Jan-Benedict Glaw)
PR/58220: Kouichi Hashikawa: use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.46.1 src/sys/conf/newvers.mk
cvs rdiff -u -r1.62 -r1.62.44.1 src/sys/conf/newvers.sh
cvs rdiff -u -r1.4 -r1.4.12.1 src/sys/conf/newvers_stand.mk
cvs rdiff -u -r1.9 -r1.9.44.1 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.mk
diff -u src/sys/conf/newvers.mk:1.2 src/sys/conf/newvers.mk:1.2.46.1
--- src/sys/conf/newvers.mk:1.2 Sat Apr 8 18:24:09 2017
+++ src/sys/conf/newvers.mk Sat Oct 12 11:16:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: newvers.mk,v 1.2 2017/04/08 18:24:09 christos Exp $
+# $NetBSD: newvers.mk,v 1.2.46.1 2024/10/12 11:16:04 martin Exp $
MKREPRO?=no
@@ -17,7 +17,8 @@ newvers: vers.o
vers.o: ${SYSTEM_OBJ:O} Makefile $S/conf/newvers.sh \
$S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
- ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
+ TOOL_AWK=${TOOL_AWK} TOOL_DATE=${TOOL_DATE} \
+ ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
${_MKTARGET_COMPILE}
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
${COMPILE_CTFCONVERT}
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.62 src/sys/conf/newvers.sh:1.62.44.1
--- src/sys/conf/newvers.sh:1.62 Sat Apr 8 18:24:09 2017
+++ src/sys/conf/newvers.sh Sat Oct 12 11:16:04 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.62 2017/04/08 18:24:09 christos Exp $
+# $NetBSD: newvers.sh,v 1.62.44.1 2024/10/12 11:16:04 martin Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -134,7 +134,7 @@ source_lines()
else
cat
fi \
- | awk '{
+ | "${AWK}" '{
# awk does not care about whether or not the last line
# of input ends with a newline.
# Convert <backslash> to <backslash><backslash>.
@@ -153,6 +153,8 @@ if [ ! -e version ]; then
echo 0 > version
fi
+DATE=${TOOL_DATE:-date}
+AWK=${TOOL_AWK:-awk}
Rflag=false
nflag=false
timestamp=
@@ -206,7 +208,7 @@ if ${Rflag}; then
else
if [ -z "${timestamp}" ]; then
v=$(cat version)
- t=$(LC_ALL=C date)
+ t=$(LC_ALL=C ${DATE})
u=${USER-root}
h=$(hostname)
d=$(pwd)
@@ -214,7 +216,7 @@ else
echo $(expr ${v} + 1) > version
else
v=0
- t=$(LC_ALL=C TZ=UTC date -r "${timestamp}")
+ t=$(LC_ALL=C TZ=UTC ${DATE} -r "${timestamp}")
u=mkrepro
h=mkrepro.NetBSD.org
d="/usr/src/sys/arch/${machine}/compile/${id}"
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.4 src/sys/conf/newvers_stand.mk:1.4.12.1
--- src/sys/conf/newvers_stand.mk:1.4 Fri May 21 11:28:11 2021
+++ src/sys/conf/newvers_stand.mk Sat Oct 12 11:16:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.4 2021/05/21 11:28:11 nakayama Exp $
+# $NetBSD: newvers_stand.mk,v 1.4.12.1 2024/10/12 11:16:04 martin Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -19,7 +19,7 @@ VERSIONFLAGS+=-d
vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
- ${HOST_SH} ${S}/conf/newvers_stand.sh \
+ TOOL_DATE=${TOOL_DATE} ${HOST_SH} ${S}/conf/newvers_stand.sh \
-m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC:[1]} ${NEWVERSWHAT}
.endif
Index: src/sys/conf/newvers_stand.sh
diff -u src/sys/conf/newvers_stand.sh:1.9 src/sys/conf/newvers_stand.sh:1.9.44.1
--- src/sys/conf/newvers_stand.sh:1.9 Sat Apr 8 19:53:54 2017
+++ src/sys/conf/newvers_stand.sh Sat Oct 12 11:16:04 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers_stand.sh,v 1.9 2017/04/08 19:53:54 christos Exp $
+# $NetBSD: newvers_stand.sh,v 1.9.44.1 2024/10/12 11:16:04 martin Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,8 @@
# Called as:
# sh ${S}/conf/newvers_stand.sh [-dkn] [-D <date>] [-m <machine>] VERSION_TEMPLATE [EXTRA_MSG]
+DATE=${TOOL_DATE:-date}
+
cwd=$(dirname "$0")
add_name=true
@@ -45,8 +47,8 @@ dateargs=
# parse command args
while getopts "m:D:dknm:" OPT; do
- case $OPT in
- D) dateargs="-r $OPTARG";;
+ case ${OPT} in
+ D) dateargs="-r ${OPTARG}";;
d) add_date=false;;
k) add_kernrev=false;;
m) machine=${OPTARG};;
@@ -56,25 +58,25 @@ while getopts "m:D:dknm:" OPT; do
esac
done
-shift $(expr $OPTIND - 1)
+shift $(expr ${OPTIND} - 1)
r=$(awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' "$1")
shift
-t=$(LC_ALL=C TZ=UTC date $dateargs)
+t=$(LC_ALL=C TZ=UTC ${DATE} ${dateargs})
-if $add_date; then
+if ${add_date}; then
echo "const char bootprog_rev[] = \"${r} (${t})\";" > vers.c
else
echo "const char bootprog_rev[] = \"${r}\";" > vers.c
fi
-if $add_name; then
+if ${add_name}; then
extra=${1:+" $1"}
echo "const char bootprog_name[] = \"NetBSD/${machine}${extra}\";" >> vers.c
fi
-if $add_kernrev; then
+if ${add_kernrev}; then
osr=$(sh "${cwd}/osrelease.sh")
echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c
fi
