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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to