Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Mar 2010 11:17:35 -0500
From:      John Baldwin <jhb@freebsd.org>
To:        obrien@freebsd.org, src-committers@freebsd.org
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, "M. Warner Losh" <imp@bsdimp.com>
Subject:   Re: svn commit: r204824 - head/sys/conf
Message-ID:  <201003081117.35787.jhb@freebsd.org>
In-Reply-To: <20100308.090659.460114267457255328.imp@bsdimp.com>
References:  <201003071008.o27A80wC014578@svn.freebsd.org> <20100308010125.GA6387@dragon.NUXI.org> <20100308.090659.460114267457255328.imp@bsdimp.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 08 March 2010 11:06:59 am M. Warner Losh wrote:
> In message: <20100308010125.GA6387@dragon.NUXI.org>
>             "David O'Brien" <obrien@FreeBSD.org> writes:
> : On Sun, Mar 07, 2010 at 02:36:19PM -0700, M. Warner Losh wrote:
> : > Please back out this change.  It is unwise, I think.
> : 
> : Instead I'd rather fix it for the use case you mention.
> 
> I'd still rather you back it out because it introduces a significant
> regression in speed, see below...
> 
> : ---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%----
>%----
> : Index: newvers.sh
> : ===================================================================
> : --- newvers.sh	(revision 204851)
> : +++ newvers.sh	(working copy)
> : @@ -87,13 +87,11 @@ touch version
> :  v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} 
t=`date`
> :  i=`${MAKE:-make} -V KERN_IDENT`
> :  
> : +# Are we doing a kernel build?  Look for "/sys/" in pwd for 'make 
kernel',
> : +# and "/compile/" for tradiational within-tree kernel build.
> :  case "$d" in
> : -*/compile/*)
> : -	SRCDIR=${d##*obj}
> : -	if [ -n "$MACHINE" ]; then
> : -		SRCDIR=${SRCDIR##/$MACHINE}
> : -	fi
> : -	SRCDIR=$(cd ${SRCDIR%%/compile/*}/.. && pwd)
> : +*/sys/*|*/compile/*)
> : +	SRCDIR=$(realpath $(dirname $0)/..)
> :  
> :  	for dir in /bin /usr/bin /usr/local/bin; do
> :  		if [ -d "${SRCDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
> : ---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%----
>%----
> : 
> : 
> : Do you get the subversion revision in your vers.c file with this patch?
> 
> Well, except that you get the revision for the whole tree, instead of
> just for the kernel.  And this takes a *LOT* longer to compute.  The
> whole reason we did the sys hack was to make build times not suck...

Egads!  This part I definitely care about.  Fix it or revert it.

-- 
John Baldwin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003081117.35787.jhb>