From owner-svn-src-all@freebsd.org Sun Feb 7 22:04:47 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 B3401AA1DE4 for ; Sun, 7 Feb 2016 22:04:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qg0-x230.google.com (mail-qg0-x230.google.com [IPv6:2607:f8b0:400d:c04::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 70B4179F for ; Sun, 7 Feb 2016 22:04:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qg0-x230.google.com with SMTP id b35so105836872qge.0 for ; Sun, 07 Feb 2016 14:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=YN851VGjjdLMUKplNeyYmmk/mMBLpg+2I7wPkdABqlk=; b=NZMCZjIbf3O0EI1r6fhwx/QalBmWhIAy+IpranSvLXwm8NvP5c89uljipYWmqUc8SB 8QTTpT9vYlTj/Ibn7MVypDgS9MbjwTe6Yqq3IjgY422CKVL161FLUDb3UaXDJkt/eBhB 4knS/m2gcrdXt/YgHKiyVVUxRI3fCZRftVmwYA/bni4YReo/uGj7buH60gxmrv7pZYow YKx8wvcpNv6+vI3Ojd0nI2SliL7aVSZIEE22TKW4oaS89GSeboj+/gB6lAzSlvdkt9Vt VK8duEtEBiuWs9TabcYMQeF8tdvqjcyyS+wlHatYenEMtvn+oUrmBi43vKhcP+5kMEp8 p2qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=YN851VGjjdLMUKplNeyYmmk/mMBLpg+2I7wPkdABqlk=; b=Kh7eYLj/Uzs98B2lYA8l6AlUqlp1i8zmxy3Ajx4+TyCrfO3M8eyHAcEhyVEomiyUiC kr7N02MWs9pVS7ojn4gQGmW4uFei63bEW8G01fYeA7E5lGzUf+w+OEHQHUwHQgIJm3du k+t3iYoIEPaJLMvl58BNPOAar20rHD3V0JjNAmthSCaQaN36FRr8dGv4Ct2z9o1+laku rH0A09Q+VvB9ELflt8Y04rYVX8gyNuZ4XAyBmmww4pMp/zwQQJPAdQW7Nh7SAfs58ZbF 4W51ai3ipNSogGRuUFw1MpUAWchmRDjahiN4BYVZYfY7RoPxpSXxHsSI3KqRsclWqW1x RDgA== X-Gm-Message-State: AG10YORqpzyfTcpuwtRyBwlVudk9YdTcWE3qwAlY7CoChw0/0J8EjEG8MqaUuIy4KuOvyHvZGtfbhZhjAZm/Gw== MIME-Version: 1.0 X-Received: by 10.140.135.147 with SMTP id 141mr12326114qhh.74.1454882686415; Sun, 07 Feb 2016 14:04:46 -0800 (PST) Sender: wlosh@bsdimp.com Received: by 10.140.30.166 with HTTP; Sun, 7 Feb 2016 14:04:46 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <20160207201448.75df1eae@zapp.Home> References: <201602071644.u17GiEgE034636@repo.freebsd.org> <20160207201448.75df1eae@zapp.Home> Date: Sun, 7 Feb 2016 15:04:46 -0700 X-Google-Sender-Auth: XpDWYYeN_EFv_-ICuOleAhBPLVw Message-ID: Subject: Re: svn commit: r295377 - head/tools/tools/nanobsd/embedded From: Warner Losh To: Andrew Turner Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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 22:04:47 -0000 On Sun, Feb 7, 2016 at 1:14 PM, Andrew Turner wrote: > 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? > No. I'll track down how my builds worked for me when we're not creating this directory anywhere... Warner