From owner-svn-src-head@FreeBSD.ORG Wed Jan 21 22:54:33 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01CEDC61; Wed, 21 Jan 2015 22:54:33 +0000 (UTC) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id B8377BBA; Wed, 21 Jan 2015 22:54:32 +0000 (UTC) Received: from lgwl-lstewart2.corp.netflix.com (c110-22-60-167.eburwd6.vic.optusnet.com.au [110.22.60.167]) by lauren.room52.net (Postfix) with ESMTPSA id 52D437E839; Thu, 22 Jan 2015 09:54:30 +1100 (EST) Message-ID: <54C02E0C.6060506@freebsd.org> Date: Thu, 22 Jan 2015 09:54:04 +1100 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Will Andrews Subject: Re: svn commit: r275832 - head/tools/tools/nanobsd References: <201412161759.sBGHx6ZL016021@svn.freebsd.org> <54BF5A7B.2080601@freebsd.org> <20150121152352.GB38973@sol.firepipe.net> In-Reply-To: <20150121152352.GB38973@sol.firepipe.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=2.4 required=5.0 tests=DNS_FROM_AHBL_RHSBL, UNPARSEABLE_RELAY autolearn=no version=3.3.2 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lauren.room52.net Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, imp@freebsd.org, Will Andrews X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 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, 21 Jan 2015 22:54:33 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 01/22/15 02:23, Will Andrews wrote: > On Wed, Jan 21, 2015 at 06:51:23PM +1100, Lawrence Stewart wrote: >> I think this change introduced a bug - I'm seeing nanobsd error >> out with the "NANO_TOOLS directory does not exist" message. >> >> The problem is that NANO_TOOLS is initialised to >> "tools/tools/nanobsd", and you changed the test in nanobsd.sh to >> *not* check for "${NANO_SRC}/${NANO_TOOLS}", which errors out >> except if the cwd is ${NANO_SRC}. >> >> You tweak NANO_TOOLS appropriately in set_defaults_and_export() >> but it's run after the dir test. There are a couple of ways to >> fix but I'll leave it to you to decide which you prefer. > > Will this work for you? > > https://people.freebsd.org/~will/patches/nanobsd.sh.diff > > This also fixes another bug where NANO_PMAKE would be modified too > early. Yes, looks good to me and fixes the issue I reported. Please commit. Cheers, Lawrence -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJUwC4GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4RkIyRTlBMzM5RUE3OEExNUUxREI4QTI5 QTUwQkNGQ0Y0MEQ5QjA5AAoJEJpQvPz0DZsJ40QP+gOt9Sl11w5jLOxwfEYYKNCb AjFkwhpmbAlpLMFR7OR7DvlRG6svHaO7RzK7pTbEHID3igdSx3+NRpBE+tyAe8fC dl2hSmGLcGq6007HCGOZGW181tfv9BrRRxKwEXEP7sGhByR5hyFy0JweaLr0TpGb 8CruuZ3hUjDEaTMIBPhBaMWMNsWHJy6Qszj3iE8FwFnmMLnC9yXbfKTXP3iT88wd y+Aq86Y5NT4HytcbWOaNa6mvQTsZfxnFIVppN+u3AWpgzhh76HzOgeFKK4Wj32/j eK3v/hi/aSmOaW5AKR10n2ADutjFvMLaHhMVVIOIBTJ6KQ7W38PGR4/sTqbxkAqa AUsTm53Bz9w3fjr4YhNzOtu0nwgcD1LyUJKnwoyUig97BL8Ogphj+I/4rzB150uD dnvgLoqY8Qh2ck0eciFiKZdY9k5t0cpQPNwpRl/L+wssKbdKGg4/0Ob5/fy9HVkx JrcrkmNyIMpLsN683OMNgvbIB5ow6Ya2cNmJtHVS8N8sJ7/Sd4RYPfEWIk7UUX9b lv+NQm42CyERE98TvE6felmb+iLFF79D2e0wJAis+pbDf8KlMIC3DBjdXls+BEZm 048o1sulxUuo2YMnQHF1sP6bZgeCwI9LslJGlXmLG8WA2oL5I9GJfnkwyD6rbJyx 668QEgpTzhLuAUBXGMT8 =QGdi -----END PGP SIGNATURE-----