From owner-freebsd-bugs@FreeBSD.ORG Wed Jan 11 00:07:21 2012 Return-Path: Delivered-To: freebsd-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA086106566C; Wed, 11 Jan 2012 00:07:21 +0000 (UTC) (envelope-from kes-kes@yandex.ru) Received: from forward12.mail.yandex.net (forward12.mail.yandex.net [IPv6:2a02:6b8:0:801::2]) by mx1.freebsd.org (Postfix) with ESMTP id 21C618FC14; Wed, 11 Jan 2012 00:07:21 +0000 (UTC) Received: from smtp11.mail.yandex.net (smtp11.mail.yandex.net [95.108.130.67]) by forward12.mail.yandex.net (Yandex) with ESMTP id 8696CC21EF4; Wed, 11 Jan 2012 04:07:19 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1326240439; bh=TDTF24kEiYHHYltZDyzmq7BGixk2+WAKIfiRKV1t20E=; h=Date:From:Reply-To:Message-ID:To:CC:Subject:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding; b=XtcUSGr4PNTp6ZBBhu+OUCer2Mcks0Ak3Hblx7PRQvtB5/XmF5E+JIAnViJ5R83ge 9WB+5RxHkWedjyirPMRRQdUKWaWy1Z2jRkdSvXJEVItRvU4R63imRuVN6vCyWeTX2T WLVjQKZpLQyhLqMpr16Pfj7/HNijRK9MHnvTa6m0= Received: from smtp11.mail.yandex.net (localhost [127.0.0.1]) by smtp11.mail.yandex.net (Yandex) with ESMTP id 526177E033D; Wed, 11 Jan 2012 04:07:19 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1326240439; bh=TDTF24kEiYHHYltZDyzmq7BGixk2+WAKIfiRKV1t20E=; h=Date:From:Reply-To:Message-ID:To:CC:Subject:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding; b=XtcUSGr4PNTp6ZBBhu+OUCer2Mcks0Ak3Hblx7PRQvtB5/XmF5E+JIAnViJ5R83ge 9WB+5RxHkWedjyirPMRRQdUKWaWy1Z2jRkdSvXJEVItRvU4R63imRuVN6vCyWeTX2T WLVjQKZpLQyhLqMpr16Pfj7/HNijRK9MHnvTa6m0= Received: from unknown (unknown [176.8.25.138]) by smtp11.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7IV8HAwW-7IV8sbre; Wed, 11 Jan 2012 04:07:19 +0400 X-Yandex-Spam: 1 Date: Wed, 11 Jan 2012 02:07:17 +0200 From: =?windows-1251?B?yu7t/Oru4iDF4uPl7ejp?= X-Mailer: The Bat! (v4.0.24) Professional Organization: =?windows-1251?B?188gyu7t/Oru4iwgRnJlZUxpbmU=?= X-Priority: 3 (Normal) Message-ID: <1788789642.20120111020717@yandex.ru> To: dougb@FreeBSD.org In-Reply-To: <201201102343.q0ANhWJC010928@freefall.freebsd.org> References: <201201102343.q0ANhWJC010928@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit Cc: freebsd-bugs@FreeBSD.org, dougb@FreeBSD.org, linimon@FreeBSD.org Subject: Re[2]: bin/163997: mergemaster(8): harcoded source tree path in 'mergemaster -p' X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: =?windows-1251?B?yu7t/Oru4iDF4uPl7ejp?= List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2012 00:07:21 -0000 Здравствуйте, Dougb. Вы писали 11 января 2012 г., 1:43:32: dFo> Synopsis: mergemaster(8): harcoded source tree path in 'mergemaster -p' dFo> State-Changed-From-To: open->closed dFo> State-Changed-By: dougb dFo> State-Changed-When: Tue Jan 10 23:41:44 UTC 2012 dFo> State-Changed-Why: dFo> You need to use the -m option. dFo> If you do non-standard things, you can't expect the standard instructions dFo> to apply. :) dFo> Doug dFo> http://www.freebsd.org/cgi/query-pr.cgi?pr=163997 oh, you are right, I miss it -m /path/to/sources Specify the path to the directory where you want to do the make(1). (In other words, where your sources are, but -s was already taken.) In previous versions of mergemaster you needed to specify the path all the way to src/etc. Starting with r186678 you only need to specify the path to src. mergemaster will convert the path for you if you use the old method. but, I think, it would be nice if: first check ./ for source tree and use it. because of making world, kernel make buildworld make buildkernel assums you are in /path/to/source directory so it will be right to assum that you are in /path/to/source directory and for 'mergemaster -p' in other world: assume ./ as srouce directory instead of /usr/src -- С уважением, Коньков mailto:kes-kes@yandex.ru