Date: Sat, 28 Mar 2009 23:17:18 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190514 - head/sys/conf Message-ID: <200903282317.n2SNHIjI015202@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sat Mar 28 23:17:18 2009 New Revision: 190514 URL: http://svn.freebsd.org/changeset/base/190514 Log: 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. Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Sat Mar 28 21:06:59 2009 (r190513) +++ head/sys/conf/newvers.sh Sat Mar 28 23:17:18 2009 (r190514) @@ -100,7 +100,13 @@ for dir in /bin /usr/bin /usr/local/bin; 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903282317.n2SNHIjI015202>