From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 00:45:43 2009
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 5E5F9106566C;
	Fri,  2 Jan 2009 00:45:43 +0000 (UTC) (envelope-from sam@freebsd.org)
Received: from ebb.errno.com (ebb.errno.com [69.12.149.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F3028FC19;
	Fri,  2 Jan 2009 00:45:43 +0000 (UTC) (envelope-from sam@freebsd.org)
Received: from trouble.errno.com (trouble.errno.com [10.0.0.248])
	(authenticated bits=0)
	by ebb.errno.com (8.13.6/8.12.6) with ESMTP id n020jgDg023751
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 1 Jan 2009 16:45:42 -0800 (PST) (envelope-from sam@freebsd.org)
Message-ID: <495D63B6.3020106@freebsd.org>
Date: Thu, 01 Jan 2009 16:45:42 -0800
From: Sam Leffler <sam@freebsd.org>
Organization: FreeBSD Project
User-Agent: Thunderbird 2.0.0.18 (X11/20081209)
MIME-Version: 1.0
To: Doug Barton <dougb@freebsd.org>
References: <200901011141.n01BfDqj054333@svn.freebsd.org>
	<495D5FC3.6000109@freebsd.org> <495D62C0.7090306@FreeBSD.org>
In-Reply-To: <495D62C0.7090306@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-DCC-sonic.net-Metrics: ebb.errno.com; whitelist
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r186678 - head/usr.sbin/mergemaster
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: Fri, 02 Jan 2009 00:45:43 -0000

Doug Barton wrote:
> Sam Leffler wrote:
>   
>> Doug Barton wrote:
>>     
>>>   1. Switch to using the top level (e.g., /usr/src) Makefile, and specify
>>>   that we should use the *.mk files from the source directory instead of
>>>   the installed versions. [1][2] This allows easier cross builds and
>>>   simplifies (or in some cases permits) upgrading.
>>>   
>>>       
>> I believe you changed the meaning of the -m flag so it now requires a
>> pathname to the src tree and not src/etc.  This breaks existing usage. 
>> In the PR I filed there was a follow-on patch from Bjoern that amended
>> my suggestion to instead add a -M option to set the source tree.  I
>> thought that was an improvement over my hack.  In lieu of that you might
>> want to examine the pathname supplied to -m to try to provide backwards
>> compatibility by stripping any /etc suffix on the path.
>>     
>
> The version in bin/96528 from ru had a better fix for this issue, but
> thanks for thinking of it. :)
>
>   
That's nice to know.  Unfortunately what's in HEAD doesn't seem to work 
for my cross-install setup.  Did you test using the recipe in my PR?  I 
am debugging; could be a local problem.

    Sam