hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 20:41:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify variable expansion in attempt to fix the vm-image build.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-04-21 02:49:44 +00:00
parent c668010e3f
commit fa56961588
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281809
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/tools/vmimage.subr
View File

@ -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