From owner-svn-src-all@FreeBSD.ORG Sun Jan 18 23:21:04 2009 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 922371065670; Sun, 18 Jan 2009 23:21:04 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 822978FC12; Sun, 18 Jan 2009 23:21:04 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0INL4VM091018; Sun, 18 Jan 2009 23:21:04 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0INL4BI091017; Sun, 18 Jan 2009 23:21:04 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200901182321.n0INL4BI091017@svn.freebsd.org> From: Andrew Thompson Date: Sun, 18 Jan 2009 23:21:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187413 - 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: Sun, 18 Jan 2009 23:21:05 -0000 Author: thompsa Date: Sun Jan 18 23:21:04 2009 New Revision: 187413 URL: http://svn.freebsd.org/changeset/base/187413 Log: Also strip the machine arch from SRCDIR in case it is a cross build so svnversion works. Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Sun Jan 18 21:52:01 2009 (r187412) +++ head/sys/conf/newvers.sh Sun Jan 18 23:21:04 2009 (r187413) @@ -91,6 +91,7 @@ for dir in /bin /usr/bin /usr/local/bin; if [ -x "${dir}/svnversion" ]; then svnversion=${dir}/svnversion SRCDIR=${d##*obj} + SRCDIR=${SRCDIR##/$MACHINE} SRCDIR=${SRCDIR%%/sys/*} break fi