Module Name: src
Committed By: martin
Date: Sat Oct 12 11:41:21 UTC 2024
Modified Files:
src/sys/conf [netbsd-9]: newvers.mk newvers.sh
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1899):
sys/conf/newvers.mk: revision 1.4 (patch)
sys/conf/newvers.sh: revision 1.64 (patch)
PR/58220: Kouichi Hashikawa: use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.20.1 src/sys/conf/newvers.mk
cvs rdiff -u -r1.62 -r1.62.18.1 src/sys/conf/newvers.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.20.1
--- src/sys/conf/newvers.mk:1.2 Sat Apr 8 18:24:09 2017
+++ src/sys/conf/newvers.mk Sat Oct 12 11:41:21 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.20.1 2024/10/12 11:41:21 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} \
+ ${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.18.1
--- src/sys/conf/newvers.sh:1.62 Sat Apr 8 18:24:09 2017
+++ src/sys/conf/newvers.sh Sat Oct 12 11:41:21 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.18.1 2024/10/12 11:41:21 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,7 @@ if [ ! -e version ]; then
echo 0 > version
fi
+AWK=${TOOL_AWK:-awk}
Rflag=false
nflag=false
timestamp=
