From f56769dd008fa2d44a02274745c211f1c85d1f70 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 19 Apr 2017 21:18:06 +0000
Subject: [PATCH] Trim trailing '/release/..' when setting _OBJDIR so
 arm64/aarch64 boot1.efifat is properly located when creating virtual machine
 images.

Sponsored by:	The FreeBSD Foundation
---
 release/tools/vmimage.subr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 14ef7f106e30..6c3916e333e7 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -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