diff options
| author | bz <bz@FreeBSD.org> | 2009-03-28 23:17:18 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-03-28 23:17:18 +0000 |
| commit | ccb540b1ee57e71fe1a36a849ffb2307411e7a6d (patch) | |
| tree | e3d87d38ac2103c25e703a8e2ebc7a44a19d9298 | |
| parent | 4b994f250d069744dacf99e4dafde0bc5f2a2606 (diff) | |
| download | FreeBSD-src-ccb540b1ee57e71fe1a36a849ffb2307411e7a6d.zip FreeBSD-src-ccb540b1ee57e71fe1a36a849ffb2307411e7a6d.tar.gz | |
For kernel builds reduce the impact of svnversion, just scanning
src/sys and not the entire src/ tree.
An earlier solution by peter had been comitted in r183528 and backed out
in r183566 due to problems with newvers.sh also called from other places
during world build. With the extra test this survived a make universe.
| -rw-r--r-- | sys/conf/newvers.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f141a8c..134e46e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -100,7 +100,13 @@ for dir in /bin /usr/bin /usr/local/bin; do done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + # If we are called from the kernel build, limit + # the scope of svnversion to sys/ . + if [ -e "${SRCDIR}/sys/conf/newvers.sh" ] ; then + svn=" r`cd $SRCDIR/sys && $svnversion`" + else + svn=" r`cd $SRCDIR && $svnversion`" + fi else svn="" fi |
