From owner-svn-src-stable@freebsd.org  Wed Apr 26 16:27:21 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62276D515B4;
 Wed, 26 Apr 2017 16:27:21 +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 mx1.freebsd.org (Postfix) with ESMTPS id 339AD277;
 Wed, 26 Apr 2017 16:27:21 +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 v3QGRKZY054856;
 Wed, 26 Apr 2017 16:27:20 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3QGRKSW054855;
 Wed, 26 Apr 2017 16:27:20 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201704261627.v3QGRKSW054855@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: Wed, 26 Apr 2017 16:27:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r317442 - in stable: 10/release/tools 11/release/tools
X-SVN-Group: stable-10
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.23
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: Wed, 26 Apr 2017 16:27:21 -0000

Author: gjb
Date: Wed Apr 26 16:27:20 2017
New Revision: 317442
URL: https://svnweb.freebsd.org/changeset/base/317442

Log:
  MFC r317169:
   Trim trailing '/release/..' when setting _OBJDIR so arm64/aarch64
   boot1.efifat is properly located when creating virtual machine images.
  
   Note, the underlying issue has no direct impact against stable/10,
   as arm64/aarch64 virtual machine images are not created for 10-STABLE.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/tools/vmimage.subr
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/tools/vmimage.subr
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/tools/vmimage.subr
==============================================================================
--- stable/10/release/tools/vmimage.subr	Wed Apr 26 16:13:22 2017	(r317441)
+++ stable/10/release/tools/vmimage.subr	Wed Apr 26 16:27:20 2017	(r317442)
@@ -15,6 +15,7 @@ write_partition_layout() {
 	fi
 
 	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
+	_OBJDIR="$(realpath ${_OBJDIR})"
 	if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
 		BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
 	else