From owner-svn-src-all@freebsd.org Mon Dec 4 17:15:01 2017 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 1FE39E5E75A; Mon, 4 Dec 2017 17:15:01 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDD6D7116F; Mon, 4 Dec 2017 17:15:00 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vB4HEwxL046936; Mon, 4 Dec 2017 09:14:58 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vB4HEwpd046935; Mon, 4 Dec 2017 09:14:58 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201712041714.vB4HEwpd046935@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r326535 - head/tools/boot In-Reply-To: <201712041638.vB4GcK0q087528@repo.freebsd.org> To: Warner Losh Date: Mon, 4 Dec 2017 09:14:58 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Mon, 04 Dec 2017 17:15:01 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: imp > Date: Mon Dec 4 16:38:20 2017 > New Revision: 326535 > URL: https://svnweb.freebsd.org/changeset/base/326535 > > Log: > Just use the last line of the output from getting .OBJDIR. The > buildenv target prints other stuff too that needs to be ignored. > > Sponsored by: Netflix > > Modified: > head/tools/boot/universe.sh > > Modified: head/tools/boot/universe.sh > ============================================================================== > --- head/tools/boot/universe.sh Mon Dec 4 15:28:07 2017 (r326534) > +++ head/tools/boot/universe.sh Mon Dec 4 16:38:20 2017 (r326535) > @@ -26,7 +26,7 @@ dobuild() > local opt=$3 > > echo -n "Building $ta ${opt} ... " > - objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR") > + objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR" | tail -1) > rm -rf ${objdir} > if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \ > > $lf 2>&1; then We should probably find a better way than this, that is a very error prone mechanism to use. And given your gona run an rm -rf on the return value very dangerious if wrong. Something like adding a QUIET=true to buildenv so that it only outputs the desired value? Or having buildenv have options to directly output your desired .OBJDIR value? -- Rod Grimes rgrimes@freebsd.org