From owner-svn-src-head@FreeBSD.ORG  Sun Mar  7 21:44: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 20BFE106566B;
	Sun,  7 Mar 2010 21:44:32 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B8578FC13;
	Sun,  7 Mar 2010 21:44:31 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o27LZuUl063951;
	Sun, 7 Mar 2010 14:35:56 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Sun, 07 Mar 2010 14:36:19 -0700 (MST)
Message-Id: <20100307.143619.510313205755027975.imp@bsdimp.com>
To: obrien@FreeBSD.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <201003071008.o27A80wC014578@svn.freebsd.org>
References: <201003071008.o27A80wC014578@svn.freebsd.org>
X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
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
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: Sun, 07 Mar 2010 21:44:32 -0000

In message: <201003071008.o27A80wC014578@svn.freebsd.org>
            "David E. O'Brien" <obrien@FreeBSD.org> writes:
: Author: obrien
: Date: Sun Mar  7 10:08:00 2010
: New Revision: 204824
: URL: http://svn.freebsd.org/changeset/base/204824
: 
: Log:
:   Look for "compile" to decide if this is run as part of the kernel build.
:   The assumption of "${ARCH}/compile/FOO" is much harder to change in our
:   build (so assume one hasn't), then assuming every kernel is rooted at "sys/".

Except buildkernel builds the kernel into
$MAKEOBJDIRPREFIX/$ARCH/$PATH_TO_TOP/sys/FOO ($ARCH/ is omitted when
building natively).

Please back out this change.  It is unwise, I think.

Warner

: Modified:
:   head/sys/conf/newvers.sh
: 
: Modified: head/sys/conf/newvers.sh
: ==============================================================================
: --- head/sys/conf/newvers.sh	Sun Mar  7 09:52:35 2010	(r204823)
: +++ head/sys/conf/newvers.sh	Sun Mar  7 10:08:00 2010	(r204824)
: @@ -88,15 +88,15 @@ v=`cat version` u=${USER:-root} d=`pwd` 
:  i=`${MAKE:-make} -V KERN_IDENT`
:  
:  case "$d" in
: -*/sys/*)
: +*/compile/*)
:  	SRCDIR=${d##*obj}
:  	if [ -n "$MACHINE" ]; then
:  		SRCDIR=${SRCDIR##/$MACHINE}
:  	fi
: -	SRCDIR=${SRCDIR%%/sys/*}
: +	SRCDIR=$(cd ${SRCDIR%%/compile/*}/.. && pwd)
:  
:  	for dir in /bin /usr/bin /usr/local/bin; do
: -		if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then
: +		if [ -d "${SRCDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
:  			svnversion=${dir}/svnversion
:  			break
:  		fi
: @@ -107,7 +107,7 @@ case "$d" in
:  	done
:  
:  	if [ -n "$svnversion" ] ; then
: -		svn=" r`cd ${SRCDIR}/sys && $svnversion`"
: +		svn=" r`cd ${SRCDIR} && $svnversion`"
:  	fi
:  	if [ -n "$git_cmd" ] ; then
:  		git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null`
: