From owner-svn-src-head@FreeBSD.ORG Wed Nov 10 06:29:15 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 15E311065673; Wed, 10 Nov 2010 06:29:15 +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 AA2ED8FC14; Wed, 10 Nov 2010 06:29:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id oAA6QXWV031823; Tue, 9 Nov 2010 23:26:33 -0700 (MST) (envelope-from imp@bsdimp.com) Message-ID: <4CDA3B19.8000108@bsdimp.com> Date: Tue, 09 Nov 2010 23:26:33 -0700 From: Warner Losh User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.9) Gecko/20100918 Thunderbird/3.1.4 MIME-Version: 1.0 To: Garrett Cooper References: <201011100056.oAA0uimN067694@svn.freebsd.org> <4CDA2275.1030403@bsdimp.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-committers@FreeBSD.org, Warner Losh Subject: Re: svn commit: r215070 - head/tools/tools/nanobsd 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: Wed, 10 Nov 2010 06:29:15 -0000 On 11/09/2010 23:10, Garrett Cooper wrote: > On Tue, Nov 9, 2010 at 8:41 PM, Warner Losh wrote: >> On 11/09/2010 18:25, Garrett Cooper wrote: >>> On Tue, Nov 9, 2010 at 4:56 PM, Warner Losh wrote: >>>> Author: imp >>>> Date: Wed Nov 10 00:56:44 2010 >>>> New Revision: 215070 >>>> URL: http://svn.freebsd.org/changeset/base/215070 >>>> >>>> Log: >>>> Build make.conf when the world is not selected to build, but the >>>> kernel is. >>>> >>>> PR: 151696 >>>> Submitted by: lev@ >>>> >>>> Modified: >>>> head/tools/tools/nanobsd/nanobsd.sh >>>> >>>> Modified: head/tools/tools/nanobsd/nanobsd.sh >>>> >>>> ============================================================================== >>>> --- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:39:42 2010 >>>> (r215069) >>>> +++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:56:44 2010 >>>> (r215070) >>>> @@ -917,6 +917,9 @@ else >>>> fi >>>> >>>> if $do_kernel ; then >>>> + if ! $do_world ; then >>>> + make_conf_build >>>> + fi >>>> build_kernel >>>> else >>>> pprint 2 "Skipping buildkernel (as instructed)" >>> Funny that it overwrites __MAKE_CONF, but not SRCCONF (seems like >>> the latter would infect a system more than the former *shrugs*); I >>> think I understand why it's not set in this script though, because >>> IIRC src.conf predates nanobsd. >>> I set my core variables and features in src.conf so I think it'd >>> probably be better to block that out too. >>> Should I provide a patch for this item? >> __MAKE_CONF is the root of all evil. SRCCONF shouldn't affect anything if >> __MAKE_CONF is overriden. If it does, then point me at the code in src that >> pulls it in? > $ cat test-srcconf.mk > .include > $ tail -n 1 /etc/src.conf > .error "Hallo old chap!" > $ make __MAKE_CONF=/dev/null -f test-srcconf.mk > "/etc/src.conf", line 64: "Hallo old chap!" > > They're completely different methods of supplying different bits of info :). At least the patch looks trivial.. Warner > Thanks! > -Garrett > > >