From owner-svn-src-head@FreeBSD.ORG Wed Nov 10 01:25:50 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 10242106564A for ; Wed, 10 Nov 2010 01:25:50 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ww0-f41.google.com (mail-ww0-f41.google.com [74.125.82.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9655B8FC13 for ; Wed, 10 Nov 2010 01:25:48 +0000 (UTC) Received: by wwb29 with SMTP id 29so573053wwb.2 for ; Tue, 09 Nov 2010 17:25:48 -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=Lad1g3f5R32DbGSzt2VkavCRfEf26BDz12J49W0kMnE=; b=A4CB3B8fsWN9C2NexSwu7c0xrp1w7ydvn+3UQS28b7m0j4peY2bNQEF0mIMfqsnqXj X5NUex9+fUBkpqXl8S1ZOxjRC7lza8GXroJPpmf6WAeoBTNuxL7/U72b+2zgDj1cgcLN Np1fy8tbuD1zd6DBnaIXADFXLuWB3K7gtmoBY= 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=IZOIrUGZV9n9s1TIVehzQr5wj7DQzp3QWsdg093JkDZnz19fVNA/QEgNVQAsHbLCrx Q3I7+heOCj8WGqnwrL8zbNPjhESksGmgcg6F28OnhH57+tWvIn9VLd/uoAf1dUYls+8M 2s7PuGR/kOassUgDeFuO4HXe6OzVnrZbLV6no= MIME-Version: 1.0 Received: by 10.216.82.197 with SMTP id o47mr7679555wee.45.1289352347299; Tue, 09 Nov 2010 17:25:47 -0800 (PST) Sender: yanegomi@gmail.com Received: by 10.216.198.27 with HTTP; Tue, 9 Nov 2010 17:25:47 -0800 (PST) In-Reply-To: <201011100056.oAA0uimN067694@svn.freebsd.org> References: <201011100056.oAA0uimN067694@svn.freebsd.org> Date: Tue, 9 Nov 2010 17:25:47 -0800 X-Google-Sender-Auth: Gw3ux_RfK-XO3sX753krgq-9OXI 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 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 01:25:50 -0000 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: > =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 =A0 = =A0 =A0(r215069) > +++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:56:44 2010 =A0 =A0 = =A0 =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)" 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? Thanks, -Garrett