diff options
| author | gjb <gjb@FreeBSD.org> | 2015-04-21 02:49:44 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-04-21 02:49:44 +0000 |
| commit | 62ee754a897dd8661a66daf450f23385a48e0474 (patch) | |
| tree | 2ae31512308897569e42a56a94c15c70163c55a8 /release/tools | |
| parent | 3cf803621d1a6a7c69d55c0b4ea1adbcd758d427 (diff) | |
| download | FreeBSD-src-62ee754a897dd8661a66daf450f23385a48e0474.zip FreeBSD-src-62ee754a897dd8661a66daf450f23385a48e0474.tar.gz | |
Simplify variable expansion in attempt to fix the vm-image build.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/vmimage.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 9cff4ec..d9c95c6 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -14,9 +14,9 @@ write_partition_layout() { SWAPOPT="-p freebsd-swap/swapfs::1G" fi - _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" - if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then - BOOTFILES="${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" + _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR | tr -d '/usr/src')" + if [ -d "${_OBJDIR}/${TARGET}.${TARGET_ARCH}" ]; then + BOOTFILES="${_OBJDIR}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" else BOOTFILES="${_OBJDIR}/usr/src/sys/boot" fi |
