Module Name: src
Committed By: christos
Date: Sat Apr 8 19:53:54 UTC 2017
Modified Files:
src/sys/conf: newvers_stand.sh
Added Files:
src/sys/conf: newvers_stand.mk
Log Message:
Add makefile snippet for vers.c building.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/conf/newvers_stand.mk
cvs rdiff -u -r1.8 -r1.9 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_stand.sh
diff -u src/sys/conf/newvers_stand.sh:1.8 src/sys/conf/newvers_stand.sh:1.9
--- src/sys/conf/newvers_stand.sh:1.8 Sat Jan 22 14:19:25 2011
+++ src/sys/conf/newvers_stand.sh Sat Apr 8 15:53:54 2017
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers_stand.sh,v 1.8 2011/01/22 19:19:25 joerg Exp $
+# $NetBSD: newvers_stand.sh,v 1.9 2017/04/08 19:53:54 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,44 +33,48 @@
# bootblock build on various architectures.
#
# Called as:
-# sh ${S}/conf/newvers_stand.sh [-N] VERSION_FILE ARCH [EXTRA_MSG]
+# sh ${S}/conf/newvers_stand.sh [-dkn] [-D <date>] [-m <machine>] VERSION_TEMPLATE [EXTRA_MSG]
-cwd=$(dirname $0)
+cwd=$(dirname "$0")
-add_name=yes
-add_date=no
-add_kernrev=yes
+add_name=true
+add_date=true
+add_kernrev=true
+machine="unknown"
+dateargs=
# parse command args
-while getopts "DKN?" OPT; do
+while getopts "m:D:dknm:" OPT; do
case $OPT in
- D) add_date=yes;;
- K) add_kernrev=no;;
- N) add_name=no;;
- ?) echo "Syntax: newvers_stand.sh [-NDMK] VERSION_TEMPLATE ARCH EXTRA_COMMENT" >&2
+ D) dateargs="-r $OPTARG";;
+ d) add_date=false;;
+ k) add_kernrev=false;;
+ m) machine=${OPTARG};;
+ n) add_name=false;;
+ *) echo "Usage: newvers_stand.sh [-dkn] [-D <date>] [-m <machine>] VERSION_TEMPLATE EXTRA_COMMENT" >&2
exit 1;;
esac
done
-shift `expr $OPTIND - 1`
+shift $(expr $OPTIND - 1)
-r=`awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' $1`
-t=`LC_ALL=C date`
+r=$(awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' "$1")
+shift
+t=$(LC_ALL=C TZ=UTC date $dateargs)
-if [ $add_date = yes ]; 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 = yes ]; then
- a="$2" # architecture name
- extra=${3:+" $3"}
+if $add_name; then
+ extra=${1:+" $1"}
- echo "const char bootprog_name[] = \"NetBSD/${a}${extra}\";" >> vers.c
+ echo "const char bootprog_name[] = \"NetBSD/${machine}${extra}\";" >> vers.c
fi
-if [ $add_kernrev = yes ]; then
- osr=$(sh ${cwd}/osrelease.sh)
+if $add_kernrev; then
+ osr=$(sh "${cwd}/osrelease.sh")
echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c
fi
Added files:
Index: src/sys/conf/newvers_stand.mk
diff -u /dev/null src/sys/conf/newvers_stand.mk:1.1
--- /dev/null Sat Apr 8 15:53:54 2017
+++ src/sys/conf/newvers_stand.mk Sat Apr 8 15:53:54 2017
@@ -0,0 +1,25 @@
+# $NetBSD: newvers_stand.mk,v 1.1 2017/04/08 19:53:54 christos Exp $
+
+VERSIONFILE?=version
+VERSIONMACHINE?=${MACHINE}
+.if exists(${VERSIONFILE})
+
+.if !make(depend)
+SRCS+= vers.c
+.endif
+CLEANFILES+= vers.c
+
+.if ${MKREPRO:Uno} == "yes"
+. if ${MKREPRO_TIMESTAMP:U0} != 0}
+VERSIONFLAGS+=-D ${MKREPRO_TIMESTAMP}
+. else
+VERSIONFLAGS+=-d
+. endif
+.endif
+
+vers.c: ${VERSIONFILE}
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${S}/conf/newvers_stand.sh \
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC} ${NEWVERSWHAT}
+
+.endif
