Author: gjb
Date: Mon Nov 20 15:03:03 2017
New Revision: 326013
URL: https://svnweb.freebsd.org/changeset/base/326013

Log:
  Use chroot(8) when invoking realpath(1) when setting BOOTFILES,
  otherwise realpath(1) exits due to a nonexistent directory.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/arm64/PINE64.conf
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/PINE64.conf
==============================================================================
--- head/release/arm64/PINE64.conf      Mon Nov 20 09:24:01 2017        
(r326012)
+++ head/release/arm64/PINE64.conf      Mon Nov 20 15:03:03 2017        
(r326013)
@@ -31,7 +31,7 @@ arm_install_uboot() {
            env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
            WITH_UNIFIED_OBJDIR=yes \
            make -C ${WORLDDIR}/stand -V .OBJDIR)"
-       BOOTFILES="$(realpath ${BOOTFILES})"
+       BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
 
        chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
        chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \

Modified: head/release/arm64/RPI3.conf
==============================================================================
--- head/release/arm64/RPI3.conf        Mon Nov 20 09:24:01 2017        
(r326012)
+++ head/release/arm64/RPI3.conf        Mon Nov 20 15:03:03 2017        
(r326013)
@@ -44,7 +44,7 @@ arm_install_uboot() {
                env TARGET=${EMBEDDED_TARGET} 
TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
                WITH_UNIFIED_OBJDIR=yes \
                make -C ${WORLDDIR}/stand -V .OBJDIR)"
-       BOOTFILES="$(realpath ${BOOTFILES})"
+       BOOTFILES="$(chroot ${CHROOTDIR} realpath ${BOOTFILES})"
 
        chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
        chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to