svn commit: r295377 - head/tools/tools/nanobsd/embedded

[Warner Losh]

On Sun, Feb 7, 2016 at 1:14 PM, Andrew Turner <andrew at fubar.geek.nz> wrote:

> On Sun, 7 Feb 2016 16:44:14 +0000 (UTC)
> Warner Losh <imp at 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