svn commit: r331292 - head/release/arm64

[Glen Barber]

Author: gjb
Date: Wed Mar 21 14:36:16 2018
New Revision: 331292
URL: https://svnweb.freebsd.org/changeset/base/331292

Log:
  Following ports commit r465175, avoid fetch(1) to obtain
  overlays and DTB files for the RPI3.
  
  Submitted by:	manu
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/RPI3.conf
==============================================================================
--- head/release/arm64/RPI3.conf	Wed Mar 21 12:55:59 2018	(r331291)
+++ head/release/arm64/RPI3.conf	Wed Mar 21 14:36:16 2018	(r331292)
@@ -3,18 +3,19 @@
 # $FreeBSD$
 #
 
-DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot"
+DTB_DIR="/usr/local/share/rpi-firmware"
 DTB="bcm2710-rpi-3-b.dtb"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss"
+EMBEDDEDPORTS="sysutils/u-boot-rpi3 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
 IMAGE_SIZE="2560M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+OL_DIR="${DTB_DIR}/overlays"
 OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="RPI3"
@@ -33,11 +34,11 @@ arm_install_uboot() {
 		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
 			${FATMOUNT}/${_UF}
 	done
-	chroot ${CHROOTDIR} fetch -o "${FATMOUNT}/${DTB}" "${DTB_REPO}/${DTB}?raw=true"
+	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${DTB} ${FATMOUNT}/${DTB}
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do
-		chroot ${CHROOTDIR} fetch -o "${FATMOUNT}/overlays/${_OL}"\
-			"${DTB_REPO}/overlays/${_OL}?raw=true"
+		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
+			${FATMOUNT}/overlays/${_OL}
 	done
 
 	BOOTFILES="$(chroot ${CHROOTDIR} \