Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Apr 2017 21:18:06 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r317169 - head/release/tools
Message-ID:  <201704192118.v3JLI6QA008074@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Wed Apr 19 21:18:06 2017
New Revision: 317169
URL: https://svnweb.freebsd.org/changeset/base/317169

Log:
  Trim trailing '/release/..' when setting _OBJDIR so arm64/aarch64
  boot1.efifat is properly located when creating virtual machine images.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/vmimage.subr

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Wed Apr 19 20:45:46 2017	(r317168)
+++ head/release/tools/vmimage.subr	Wed Apr 19 21:18:06 2017	(r317169)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704192118.v3JLI6QA008074>