summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2008-07-16 10:29:42 +0000
committerdougb <dougb@FreeBSD.org>2008-07-16 10:29:42 +0000
commit325ad164dcb7f3876f694f4c4395b04bc2cc9ddb (patch)
tree5ce54b678ee70e557e351a243c3cc56c367b7f48 /sys/conf
parent625d894d613f6d37a47cc4e12ead43f3e3a70f18 (diff)
downloadFreeBSD-src-325ad164dcb7f3876f694f4c4395b04bc2cc9ddb.zip
FreeBSD-src-325ad164dcb7f3876f694f4c4395b04bc2cc9ddb.tar.gz
MFC r179637, r179655, and r180503, the inclusion of the svnversion info
for uname.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/newvers.sh20
1 files changed, 18 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index b489c7b..71a54ce 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -86,10 +86,26 @@ fi
touch version
v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
i=`${MAKE:-make} -V KERN_IDENT`
+
+for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/svnversion" ]; then
+ svnversion=${dir}/svnversion
+ SRCDIR=${d##*obj}
+ SRCDIR=${SRCDIR%%/sys/*}
+ break
+ fi
+done
+
+if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then
+ svn=" r`cd $SRCDIR && $svnversion`"
+else
+ svn=""
+fi
+
cat << EOF > vers.c
$COPYRIGHT
-#define SCCSSTR "@(#)${VERSION} #${v}: ${t}"
-#define VERSTR "${VERSION} #${v}: ${t}\\n ${u}@${h}:${d}\\n"
+#define SCCSSTR "@(#)${VERSION} #${v}${svn}: ${t}"
+#define VERSTR "${VERSION} #${v}${svn}: ${t}\\n ${u}@${h}:${d}\\n"
#define RELSTR "${RELEASE}"
char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
OpenPOWER on IntegriCloud