From owner-svn-src-stable@freebsd.org  Thu Jul 26 16:08:36 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06054105369E;
 Thu, 26 Jul 2018 16:08:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 92090960E5;
 Thu, 26 Jul 2018 16:08:35 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 164C83401;
 Thu, 26 Jul 2018 16:08:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QG8YH8003391;
 Thu, 26 Jul 2018 16:08:34 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QG8Yi6003390;
 Thu, 26 Jul 2018 16:08:34 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201807261608.w6QG8Yi6003390@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 26 Jul 2018 16:08:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r336741 - stable/11/release/tools
X-SVN-Group: stable-11
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: stable/11/release/tools
X-SVN-Commit-Revision: 336741
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2018 16:08:36 -0000

Author: gjb
Date: Thu Jul 26 16:08:34 2018
New Revision: 336741
URL: https://svnweb.freebsd.org/changeset/base/336741

Log:
  Following r336726, explicitly invoke the 'obj' target when
  setting BOOTFILES.  On stable/11, without this change, the
  .OBJDIR expands to /usr/src/stand instead /usr/obj/<foo>.
  
  This is a piece of duct tape for now until I figure out why
  the correct directory is not being located.
  
  This is a direct commit to stable/11.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/tools/arm.subr

Modified: stable/11/release/tools/arm.subr
==============================================================================
--- stable/11/release/tools/arm.subr	Thu Jul 26 16:08:26 2018	(r336740)
+++ stable/11/release/tools/arm.subr	Thu Jul 26 16:08:34 2018	(r336741)
@@ -142,6 +142,10 @@ arm_install_boot() {
 		${FATMOUNT}/ubldr.bin
 	fi
 
+	# Ensure the correct .OBJDIR exists.
+	chroot ${CHROOTDIR} env TARGET=${EMBEDDED_TARGET} \
+		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} WITH_UNIFIED_OBJDIR=yes \
+		make -C ${WORLDDIR}/stand obj
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 		env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		WITH_UNIFIED_OBJDIR=yes \