From 2c26d77d989abe48c662eeb6f52f7e4c9b81680c Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 2 Mar 2021 11:47:00 -0500
Subject: [PATCH] Remove /boot/efi from mtree, missed in 0b7472b3d8d2.

This had prevented the bootconfig step from determining if an ESP exists,
resulting in its unconditional setup. On BIOS-booted amd64, this wasn't
harmful, just unnecessary, but it resulted in failed installations on
non-EFI-supporting platforms like powerpc64.

MFC after:	3 days
---
 etc/mtree/BSD.root.dist | 2 --
 release/tools/arm.subr  | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index f734f7891429..1dc9e179b0fc 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -18,8 +18,6 @@
             rockchip              tags=package=runtime
             ..
         ..
-        efi
-        ..
         firmware
         ..
         loader.conf.d             tags=package=bootloader
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 343d9f3a7034..2f91490c0859 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -184,6 +184,7 @@ arm_install_base() {
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
 		${CONF_FILES} installworld installkernel distribution
+	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
 
 	arm_create_user