From owner-svn-src-head@FreeBSD.ORG  Tue Sep 21 04:47:38 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 8B41B106566B;
	Tue, 21 Sep 2010 04:47:38 +0000 (UTC) (envelope-from andy@fud.org.nz)
Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50])
	by mx1.freebsd.org (Postfix) with ESMTP id A96598FC0C;
	Tue, 21 Sep 2010 04:47:37 +0000 (UTC)
Received: by wwc33 with SMTP id 33so523356wwc.31
	for <multiple recipients>; Mon, 20 Sep 2010 21:47:36 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.227.141.138 with SMTP id m10mr2710833wbu.20.1285044456515;
	Mon, 20 Sep 2010 21:47:36 -0700 (PDT)
Sender: andy@fud.org.nz
Received: by 10.227.157.85 with HTTP; Mon, 20 Sep 2010 21:47:36 -0700 (PDT)
In-Reply-To: <201006241632.o5OGWKBb040575@svn.freebsd.org>
References: <201006241632.o5OGWKBb040575@svn.freebsd.org>
Date: Tue, 21 Sep 2010 16:47:36 +1200
X-Google-Sender-Auth: qTPbZYVT53zOv3vFzp6U3k4jMZA
Message-ID: <AANLkTikBUHDM+cboWity4sbdwLxx74JYSxhWVgG+Hb0C@mail.gmail.com>
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Warner Losh <imp@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r209510 - head
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: Tue, 21 Sep 2010 04:47:38 -0000

On 25 June 2010 04:32, Warner Losh <imp@freebsd.org> wrote:
> Author: imp
> Date: Thu Jun 24 16:32:20 2010
> New Revision: 209510
> URL: http://svn.freebsd.org/changeset/base/209510
>
> Log:
> =A0Merge from tbemd:
>
> =A0change the name of the object tree from ${TARGET} to
> =A0${TARGET}.${TARGET_ARCH} so we can do both big and little endian
> =A0builds in the same tree.

This seems to have broken the VCS string in vers.c, does this look ok?

Index: sys/conf/newvers.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/conf/newvers.sh	(revision 212945)
+++ sys/conf/newvers.sh	(working copy)
@@ -91,7 +91,7 @@ case "$d" in
 */sys/*)
 	SRCDIR=3D${d##*obj}
 	if [ -n "$MACHINE" ]; then
-		SRCDIR=3D${SRCDIR##/$MACHINE}
+		SRCDIR=3D${SRCDIR##/$MACHINE.$MACHINE_ARCH}
 	fi
 	SRCDIR=3D${SRCDIR%%/sys/*}