From owner-svn-src-head@FreeBSD.ORG  Mon Mar  8 01:21:32 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB2721065670
	for <svn-src-head@FreeBSD.org>; Mon,  8 Mar 2010 01:21:32 +0000 (UTC)
	(envelope-from obrien@NUXI.org)
Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 110448FC0C
	for <svn-src-head@FreeBSD.org>; Mon,  8 Mar 2010 01:21:31 +0000 (UTC)
Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1])
	by dragon.nuxi.org (8.14.4/8.14.4) with ESMTP id o2811PCn006576;
	Sun, 7 Mar 2010 17:01:25 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.org)
Received: (from obrien@localhost)
	by dragon.nuxi.org (8.14.4/8.14.4/Submit) id o2811Pwo006575;
	Sun, 7 Mar 2010 17:01:25 -0800 (PST) (envelope-from obrien)
Date: Sun, 7 Mar 2010 17:01:25 -0800
From: "David O'Brien" <obrien@FreeBSD.org>
To: "M. Warner Losh" <imp@bsdimp.com>
Message-ID: <20100308010125.GA6387@dragon.NUXI.org>
References: <201003071008.o27A80wC014578@svn.freebsd.org>
	<20100307.143619.510313205755027975.imp@bsdimp.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100307.143619.510313205755027975.imp@bsdimp.com>
X-Operating-System: FreeBSD 9.0-CURRENT
X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN?
User-Agent: Mutt/1.5.16 (2007-06-09)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r204824 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: obrien@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Mar 2010 01:21:32 -0000

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.

---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%----
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?

-- 
-- David