diff options
| author | gjb <gjb@FreeBSD.org> | 2017-04-26 16:27:20 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-04-26 16:27:20 +0000 |
| commit | 41946acd41919bb95b5978cbf488991a7f179136 (patch) | |
| tree | 2bd1002bce3a4509ed7c82c921f61a289368e3da /release/tools | |
| parent | 3ed8a5dd69e932961ff7900dbee62b78df437f51 (diff) | |
| download | FreeBSD-src-41946acd41919bb95b5978cbf488991a7f179136.zip FreeBSD-src-41946acd41919bb95b5978cbf488991a7f179136.tar.gz | |
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
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/vmimage.subr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 8f058a9..c8a16f9 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 |
