From owner-svn-src-all@FreeBSD.ORG Mon Mar 8 16:17:37 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF2A0106566B; Mon, 8 Mar 2010 16:17:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 9F53A8FC16; Mon, 8 Mar 2010 16:17:37 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id F2FA446B1A; Mon, 8 Mar 2010 11:17:36 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 54AE48A01F; Mon, 8 Mar 2010 11:17:36 -0500 (EST) From: John Baldwin To: obrien@freebsd.org, src-committers@freebsd.org Date: Mon, 8 Mar 2010 11:17:35 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201003071008.o27A80wC014578@svn.freebsd.org> <20100308010125.GA6387@dragon.NUXI.org> <20100308.090659.460114267457255328.imp@bsdimp.com> In-Reply-To: <20100308.090659.460114267457255328.imp@bsdimp.com> MIME-Version: 1.0 Message-Id: <201003081117.35787.jhb@freebsd.org> Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 08 Mar 2010 11:17:36 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.5 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "M. Warner Losh" Subject: Re: svn commit: r204824 - head/sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 16:17:37 -0000 On Monday 08 March 2010 11:06:59 am M. Warner Losh wrote: > In message: <20100308010125.GA6387@dragon.NUXI.org> > "David O'Brien" 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