Date: Sun, 7 Feb 2016 15:04:46 -0700 From: Warner Losh <imp@bsdimp.com> To: Andrew Turner <andrew@fubar.geek.nz> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r295377 - head/tools/tools/nanobsd/embedded Message-ID: <CANCZdfoJi%2B%2B4FVv%2BF26Ux4Snn6-GbhRROTqwpkBLHb_3urunHQ@mail.gmail.com> In-Reply-To: <20160207201448.75df1eae@zapp.Home> References: <201602071644.u17GiEgE034636@repo.freebsd.org> <20160207201448.75df1eae@zapp.Home>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Feb 7, 2016 at 1:14 PM, Andrew Turner <andrew@fubar.geek.nz> wrote: > On Sun, 7 Feb 2016 16:44:14 +0000 (UTC) > Warner Losh <imp@FreeBSD.org> 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? > No. I'll track down how my builds worked for me when we're not creating this directory anywhere... Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoJi%2B%2B4FVv%2BF26Ux4Snn6-GbhRROTqwpkBLHb_3urunHQ>