svn commit: r323926 - releng/10.4/release/tools

[Glen Barber]

Author: gjb
Date: Fri Sep 22 14:56:43 2017
New Revision: 323926
URL: https://svnweb.freebsd.org/changeset/base/323926

Log:
  MFS10 r323925:
   MFC r323924:
   Revert r323812 from release/tools/arm.subr, which has broken the
   build on arm/armv6 images.
  
  Pointyhat:	gjb (myself)
  Approved by:	re (marius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.4/release/tools/arm.subr
Directory Properties:
  releng/10.4/   (props changed)

Modified: releng/10.4/release/tools/arm.subr
==============================================================================
--- releng/10.4/release/tools/arm.subr	Fri Sep 22 14:40:04 2017	(r323925)
+++ releng/10.4/release/tools/arm.subr	Fri Sep 22 14:56:43 2017	(r323926)
@@ -99,16 +99,6 @@ arm_install_base() {
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
 		installworld installkernel distribution
-
-	# Bootstrap etcupdate(8) and mergemaster(8) databases.
-	mkdir -p ${DESTDIR}/var/db/etcupdate
-	etcupdate extract -B \
-		-M "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \
-		-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate
-	sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \
-		-F "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \
-		-D ${DESTDIR}
-
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
 
 	arm_create_user