Re: svn commit: r190514 - head/sys/conf

Bjoern A. Zeeb wrote:
> 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)
> _at__at_ -100,7 +100,13 _at__at_ 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

I missed this when it went through originally, so my apologies for the
late response, but I don't see any way that this first test can ever
not be true. Is there a better way to detect if the script is called
in the buildkernel process?

Also, what problem are we really trying to solve here? With a
populated cache it takes on average 5 seconds to run all of src, and
just under 1 to do only sys. Is 4 seconds really that important to
save? With a dry cache I'm sure it takes a little longer, but has
anyone actually measured this?

Doug

> +		svn=" r`cd $SRCDIR/sys && $svnversion`"
> +	else
> +		svn=" r`cd $SRCDIR && $svnversion`"
> +	fi
>  else
>  	svn=""
>  fi
> 


-- 

    This .signature sanitized for your protection