git: 2c26d77d989a - main - Remove /boot/efi from mtree, missed in 0b7472b3d8d2.
Rodney W. Grimes
freebsd at gndrsh.dnsmgr.net
Tue Mar 2 18:26:43 UTC 2021
> The branch main has been updated by nwhitehorn:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=2c26d77d989abe48c662eeb6f52f7e4c9b81680c
>
> commit 2c26d77d989abe48c662eeb6f52f7e4c9b81680c
> Author: Nathan Whitehorn <nwhitehorn at FreeBSD.org>
> AuthorDate: 2021-03-02 16:47:00 +0000
> Commit: Nathan Whitehorn <nwhitehorn at FreeBSD.org>
> CommitDate: 2021-03-02 16:49:41 +0000
>
> 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
This fails to apply the proper owner/group and mode values
using what ever defaults are in place of the process running
the build.
> chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
>
> arm_create_user
>
--
Rod Grimes rgrimes at freebsd.org
More information about the dev-commits-src-all
mailing list