Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Nov 2010 22:10:37 -0800
From:      Garrett Cooper <gcooper@FreeBSD.org>
To:        Warner Losh <imp@bsdimp.com>
Cc:        svn-src-head@freebsd.org, svn-src-committers@freebsd.org, Warner Losh <imp@freebsd.org>
Subject:   Re: svn commit: r215070 - head/tools/tools/nanobsd
Message-ID:  <AANLkTimWRtyfpjhH%2BeXHgoZTBVc4WcXu%2BKhKPcDyQxKv@mail.gmail.com>
In-Reply-To: <4CDA2275.1030403@bsdimp.com>
References:  <201011100056.oAA0uimN067694@svn.freebsd.org> <AANLkTikP64BJ_y2aT8y6Pv0hFQp9MFi2kzENC_%2Bg2Xot@mail.gmail.com> <4CDA2275.1030403@bsdimp.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Nov 9, 2010 at 8:41 PM, Warner Losh <imp@bsdimp.com> wrote:
> =A0On 11/09/2010 18:25, Garrett Cooper wrote:
>>
>> On Tue, Nov 9, 2010 at 4:56 PM, Warner Losh<imp@freebsd.org> =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 <bsd.own.mk>
$ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTimWRtyfpjhH%2BeXHgoZTBVc4WcXu%2BKhKPcDyQxKv>