Date: Fri, 23 Jun 2017 00:27:40 +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: r320254 - head/release/arm64 Message-ID: <201706230027.v5N0ReQC011403@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jun 23 00:27:40 2017 New Revision: 320254 URL: https://svnweb.freebsd.org/changeset/base/320254 Log: Fix, for the fourth or fifth time now, looking up where boot1.efi is located. MFC after: 5 days X-MFC-Note: maybe X-MFC-With: r320252, r320253 Sponsored by: The FreeBSD Foundation Modified: head/release/arm64/RPI3.conf Modified: head/release/arm64/RPI3.conf ============================================================================== --- head/release/arm64/RPI3.conf Fri Jun 23 00:11:34 2017 (r320253) +++ head/release/arm64/RPI3.conf Fri Jun 23 00:27:40 2017 (r320254) @@ -45,8 +45,8 @@ arm_install_uboot() { _OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)" _OBJDIR="$(realpath ${_OBJDIR})" - if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then - BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" + if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}" ]; then + BOOTFILES="/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}/usr/src/sys/boot" else BOOTFILES="/${_OBJDIR}/sys/boot" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706230027.v5N0ReQC011403>