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/11/release/tools/vmimage.subr
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/release/tools/vmimage.subr
Directory Properties:
stable/10/ (props changed)
Modified: stable/11/release/tools/vmimage.subr
==============================================================================
--- stable/11/release/tools/vmimage.subr Wed Apr 26 16:13:22 2017
(r317441)
+++ stable/11/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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
