Date: Tue, 21 Apr 2015 14:48:39 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281832 - head/release/tools Message-ID: <201504211448.t3LEmdIO001221@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Apr 21 14:48:38 2015 New Revision: 281832 URL: https://svnweb.freebsd.org/changeset/base/281832 Log: Revert r281809, which did more harm than good, and apply a more proper fix when attempting to locate the /boot files. Sponsored by: The FreeBSD Foundation Modified: head/release/tools/vmimage.subr Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Tue Apr 21 14:48:18 2015 (r281831) +++ head/release/tools/vmimage.subr Tue Apr 21 14:48:38 2015 (r281832) @@ -14,11 +14,11 @@ write_partition_layout() { SWAPOPT="-p freebsd-swap/swapfs::1G" fi - _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" + _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" else - BOOTFILES="${_OBJDIR}/usr/src/sys/boot" + BOOTFILES="/${_OBJDIR}/sys/boot" fi case "${TARGET}:${TARGET_ARCH}" in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504211448.t3LEmdIO001221>