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
This commit is contained in:
parent
6289b482ec
commit
bf93ac7884
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=281832
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user