From owner-svn-src-all@freebsd.org Sun Feb 7 20:15:45 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC2F4AA068B; Sun, 7 Feb 2016 20:15:45 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id BFB15B1F; Sun, 7 Feb 2016 20:15:45 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from zapp.Home (bcdf01bd.skybroadband.com [188.223.1.189]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id 03FC0D7A17; Sun, 7 Feb 2016 20:15:08 +0000 (UTC) Date: Sun, 7 Feb 2016 20:14:48 +0000 From: Andrew Turner To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r295377 - head/tools/tools/nanobsd/embedded Message-ID: <20160207201448.75df1eae@zapp.Home> In-Reply-To: <201602071644.u17GiEgE034636@repo.freebsd.org> References: <201602071644.u17GiEgE034636@repo.freebsd.org> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2016 20:15:46 -0000 On Sun, 7 Feb 2016 16:44:14 +0000 (UTC) Warner Losh wrote: > Author: imp > Date: Sun Feb 7 16:44:13 2016 > New Revision: 295377 > URL: https://svnweb.freebsd.org/changeset/base/295377 > > Log: > Use new NANO_LOG to put the logs some place reasonable. Also, share > the object directory among all builds where it makes sense. When > building with NANO_CPUTYPE, separate that out to its own object > directory. Put disk files in their own directories. > > This should make having multiple variants of the same architecture > saner. > > Modified: > head/tools/tools/nanobsd/embedded/common > > Modified: head/tools/tools/nanobsd/embedded/common > ============================================================================== > --- head/tools/tools/nanobsd/embedded/common Sun Feb 7 > 16:44:06 2016 (r295376) +++ > head/tools/tools/nanobsd/embedded/common Sun Feb 7 16:44:13 > 2016 (r295377) @@ -88,23 +88,30 @@ NANO_CFG_BASE=$(pwd) > NANO_CFG_BASE=$(realpath ${NANO_CFG_BASE}/..) NANO_SRC=$(realpath > ${NANO_CFG_BASE}/../../..) #### XXX share obj > -NANO_OBJ=${NANO_SRC}/../$NANO_NAME/obj > -# Where cust_pkg() finds packages to install > -#XXX: Is this the right place? > -#NANO_PORTS=$(realpath ${NANO_SRC}/../ports) > -NANO_PORTS=/usr/ports > -NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg > +if [ -z ${NANO_CPUTYPE} ]; then > + NANO_OBJ=${NANO_SRC}/../embedded/obj > +else > + # Alas, I can't set OBJTREE to > ${MACHINE}.${MACHINE_ARCH}.${CPUTYPE} > + # so this will have to do until I can. > + NANO_OBJ=${NANO_SRC}/../embedded/obj.${NANO_CPUTYPE} > +fi > +NANO_LOG=${NANO_OBJ}/../${NANO_NAME} > +NANO_DISKIMGDIR=${NANO_OBJ}/../images NANO_DISKIMGDIR is now set, however the directory doesn't get created. Is this intentional? Andrew