svn commit: r275832 - head/tools/tools/nanobsd

[Lawrence Stewart]

-----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-----