From owner-svn-src-head@FreeBSD.ORG Wed Jan 21 15:24:08 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 BDAF539C for ; Wed, 21 Jan 2015 15:24:08 +0000 (UTC) Received: from mail-ig0-f181.google.com (mail-ig0-f181.google.com [209.85.213.181]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CC1EFB0 for ; Wed, 21 Jan 2015 15:24:08 +0000 (UTC) Received: by mail-ig0-f181.google.com with SMTP id hn18so8779604igb.2 for ; Wed, 21 Jan 2015 07:24:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=0wzgE+1s5H0tO1AVLt9Z0zI9qev1wW48KMp4KzoRJOs=; b=Az2wMUZ4khMfaBjaYnNgqaRuhSjqxUvNRnRBmFCNNYBHP/OQ6w1hdPxShTAoHEy3Of 6D0XVZHL0301lJIAmqhWSHI1lKVaRNJ1vbXxQs6K946YE7/wNw0SOXtqrFPaaM9z8v4T LpJmv8IRUlgyPe7xXs5z473vtJRJ4f/9g90JumHKgeRWtW2jwh07MjaPjSIZj9C5VIMS jFz5C7uB4nXyTKUgzN7/vZyyFyhUWiIiTL9T+eVVXurd0IeN617rvkkNgMQVmIiRZtZ3 5wcaB9GdzIFBP3SsPSzPIfquEJEP6mIpoV9Xo6ZCVdHE6bChSGOExDnroDfiroxwmdLN mDgA== X-Gm-Message-State: ALoCoQnjUOV5/FgZN6jlAxHHSKsB65/B6qVin7U3LZfGyp34fM6NuftIDB1OnlCDP2hrnqKgRC65 X-Received: by 10.50.137.99 with SMTP id qh3mr5101114igb.9.1421853842312; Wed, 21 Jan 2015 07:24:02 -0800 (PST) Received: from sol.firepipe.net (c-50-183-92-30.hsd1.co.comcast.net. [50.183.92.30]) by mx.google.com with ESMTPSA id kt1sm5966846igb.20.2015.01.21.07.24.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jan 2015 07:24:01 -0800 (PST) Date: Wed, 21 Jan 2015 08:23:59 -0700 From: Will Andrews To: Lawrence Stewart Subject: Re: svn commit: r275832 - head/tools/tools/nanobsd Message-ID: <20150121152352.GB38973@sol.firepipe.net> References: <201412161759.sBGHx6ZL016021@svn.freebsd.org> <54BF5A7B.2080601@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BwCQnh7xodEAoBMC" Content-Disposition: inline In-Reply-To: <54BF5A7B.2080601@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) 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 15:24:08 -0000 --BwCQnh7xodEAoBMC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > 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}. >=20 > 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. Thanks, --Will. --BwCQnh7xodEAoBMC Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlS/xIcACgkQF47idPgWcsVNYgCeJnWbAyN3HCbnEOMjjDdDyjcS Nr8AoIjuvgf7DM/Jr6x9NJr/gYhTvvmn =qGsa -----END PGP SIGNATURE----- --BwCQnh7xodEAoBMC--