svn commit: r338301 - stable/11/release/arm

[Glen Barber]

Author: gjb
Date: Fri Aug 24 18:31:12 2018
New Revision: 338301
URL: https://svnweb.freebsd.org/changeset/base/338301

Log:
  Fix the BEAGLEBONE image build on stable/11.
  
  r336726 merges r336598, r336599, r336600, and r336721, however
  there was a mismerge in the BEAGLEBONE.conf where two references
  to UFSMOUNT remained.
  
  This is a direct commit to stable/11, as svn:mergeinfo had already
  been recorded.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/arm/BEAGLEBONE.conf

Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf	Fri Aug 24 18:13:45 2018	(r338300)
+++ stable/11/release/arm/BEAGLEBONE.conf	Fri Aug 24 18:31:12 2018	(r338301)
@@ -24,9 +24,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
 	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}