From owner-svn-src-all@freebsd.org  Mon Dec  4 01:14:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
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 85937E6F787;
 Mon,  4 Dec 2017 01:14:18 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 470C7720F9;
 Mon,  4 Dec 2017 01:14:18 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB41EHcY078403;
 Mon, 4 Dec 2017 01:14:17 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB41EHAD078402;
 Mon, 4 Dec 2017 01:14:17 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712040114.vB41EHAD078402@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 4 Dec 2017 01:14:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326505 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 326505
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2017 01:14:18 -0000

Author: imp
Date: Mon Dec  4 01:14:17 2017
New Revision: 326505
URL: https://svnweb.freebsd.org/changeset/base/326505

Log:
  Remove the entire objdir tree to avoid picking up stale binaries from
  prior builds. Move GELI to building first.
  
  Sponsored by: Netflix

Modified:
  head/tools/boot/universe.sh

Modified: head/tools/boot/universe.sh
==============================================================================
--- head/tools/boot/universe.sh	Mon Dec  4 01:14:12 2017	(r326504)
+++ head/tools/boot/universe.sh	Mon Dec  4 01:14:17 2017	(r326505)
@@ -26,6 +26,8 @@ dobuild()
     local opt=$3
 
     echo -n "Building $ta ${opt} ... "
+    objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR")
+    rm -rf ${objdir}
     if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend"  \
 	 > $lf 2>&1; then
 	echo "Fail (cleanup)"
@@ -42,6 +44,16 @@ dobuild()
 top=$(make -V SRCTOP)
 cd $top/stand
 
+
+# Build without GELI
+for i in \
+	amd64/amd64 \
+	i386/i386 \
+	; do
+    ta=${i##*/}
+    dobuild $ta _.boot.${ta}.no_geli.log "WITHOUT_LOADER_GEIL=yes"
+done
+
 # Default build for a goodly selection of architectures
 for i in \
 	amd64/amd64 \
@@ -73,13 +85,4 @@ for i in \
 	; do
     ta=${i##*/}
     dobuild $ta _.boot.${ta}.firewire.log "MK_LOADER_FIREWIRE=yes"
-done
-
-# Build without GELI
-for i in \
-	amd64/amd64 \
-	i386/i386 \
-	; do
-    ta=${i##*/}
-    dobuild $ta _.boot.${ta}.no_geli.log "MK_LOADER_GELI=no"
 done