From owner-svn-src-head@FreeBSD.ORG Wed Nov 10 06:10:40 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 5DFC0106566C; Wed, 10 Nov 2010 06:10:40 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 968A18FC14; Wed, 10 Nov 2010 06:10:39 +0000 (UTC) Received: by wya21 with SMTP id 21so389817wya.13 for ; Tue, 09 Nov 2010 22:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=Xndf/ln0F4PSOF3uxzQFGDv+bCEmvi4EnhwK0jmJVnc=; b=pIcdR6gkRPijAwKHGs6wbhPxcKFYPueK17wb11DeurTg7J2GKnNSn7ybwWup0GQGwz zn225vgn3PjHhu8vV0FPmIgpmQigf7QV9qxCYHmcRN6bZSe5JOiy4cR3+5bX9lmsrO5X qFez7bmvSQ+/Z46TTcLc90wgfUgvvPUMpEYAI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=jCBhngsopcrcvt8ObOrj8wuvStveDOnuoqPDWr4z1aF6N5fkTyLp3wGp3MS+Gu+U4i u/nYLsN38Vae4n2GXzAuGbUsavf4El+fL6goWrqSsP4Y+4zglnvkiy9qtvei7feyw8Vw TAttLrwD0mVDTd+i0GUYP3bOYfmi+N1GcLNwo= MIME-Version: 1.0 Received: by 10.216.46.200 with SMTP id r50mr649543web.45.1289369438020; Tue, 09 Nov 2010 22:10:38 -0800 (PST) Sender: yanegomi@gmail.com Received: by 10.216.198.27 with HTTP; Tue, 9 Nov 2010 22:10:37 -0800 (PST) In-Reply-To: <4CDA2275.1030403@bsdimp.com> References: <201011100056.oAA0uimN067694@svn.freebsd.org> <4CDA2275.1030403@bsdimp.com> Date: Tue, 9 Nov 2010 22:10:37 -0800 X-Google-Sender-Auth: adUdw_cvuFEBBBktMQCeK3iuQcQ Message-ID: From: Garrett Cooper To: Warner Losh Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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:10:40 -0000 On Tue, Nov 9, 2010 at 8:41 PM, Warner Losh wrote: > =A0On 11/09/2010 18:25, Garrett Cooper wrote: >> >> On Tue, Nov 9, 2010 at 4:56 PM, Warner Losh =A0wrote: >>> >>> Author: imp >>> Date: Wed Nov 10 00:56:44 2010 >>> New Revision: 215070 >>> URL: http://svn.freebsd.org/changeset/base/215070 >>> >>> Log: >>> =A0Build make.conf when the world is not selected to build, but the >>> =A0kernel is. >>> >>> =A0PR: =A0 =A0 =A0 =A0 =A0 151696 >>> =A0Submitted by: lev@ >>> >>> Modified: >>> =A0head/tools/tools/nanobsd/nanobsd.sh >>> >>> Modified: head/tools/tools/nanobsd/nanobsd.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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:39:42 2010 >>> =A0(r215069) >>> +++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:56:44 2010 >>> =A0(r215070) >>> @@ -917,6 +917,9 @@ else >>> =A0fi >>> >>> =A0if $do_kernel ; then >>> + =A0 =A0 =A0 if ! $do_world ; then >>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 make_conf_build >>> + =A0 =A0 =A0 fi >>> =A0 =A0 =A0 =A0build_kernel >>> =A0else >>> =A0 =A0 =A0 =A0pprint 2 "Skipping buildkernel (as instructed)" >> >> =A0 =A0 Funny that it overwrites __MAKE_CONF, but not SRCCONF (seems lik= e >> 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. >> =A0 =A0 I set my core variables and features in src.conf so I think it'd >> probably be better to block that out too. >> =A0 =A0 Should I provide a patch for this item? > > __MAKE_CONF is the root of all evil. =A0SRCCONF shouldn't affect anything= if > __MAKE_CONF is overriden. =A0If 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=3D/dev/null -f test-srcconf.mk "/etc/src.conf", line 64: "Hallo old chap!" They're completely different methods of supplying different bits of inf= o :). Thanks! -Garrett