From 3f04d8c3041f72ed276e57bf9d14a6d5e99cb062 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 22 Sep 2017 14:34:27 +0000
Subject: [PATCH] Revert r323812 from release/tools/arm.subr, which has broken
 the build on arm/armv6 images.

Pointyhat:	gjb (myself)
MFC after:	immediate
MFC note:	releng/10.4 has broken because of this
Sponsored by:	The FreeBSD Foundation
---
 release/tools/arm.subr | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 118073408466..c5adbaf063d7 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -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