From owner-svn-src-head@FreeBSD.ORG Tue Sep 21 15:52:07 2010 Return-Path: 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 A35D8106564A; Tue, 21 Sep 2010 15:52:07 +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 5C7AE8FC16; Tue, 21 Sep 2010 15:52:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o8LFhn6E078851; Tue, 21 Sep 2010 09:43:50 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 21 Sep 2010 09:43:57 -0600 (MDT) Message-Id: <20100921.094357.999284355964747902.imp@bsdimp.com> To: thompsa@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <20100920.230006.634347869592887498.imp@bsdimp.com> References: <201006241632.o5OGWKBb040575@svn.freebsd.org> <20100920.230006.634347869592887498.imp@bsdimp.com> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2010 15:52:07 -0000 In message: <20100920.230006.634347869592887498.imp@bsdimp.com> "M. Warner Losh" writes: : In message: : Andrew Thompson writes: : : On 25 June 2010 04:32, Warner Losh 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 endi= an : : > =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/*} : = : Sure. 3 months to notice... : = : I think this may be because I don't have these lines anymore in my : newvers.sh... I guess what I was trying to say was that this change shouldn't be a problem. However, I've completely gutted that section of newvers.sh, since it isn't necessary, and have been running with it since before BSDcan. Maybe I'll just commit it... Warner