d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove /boot/efi from mtree, missed in 0b7472b3d8.

Browse Source 
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
This commit is contained in:
Nathan Whitehorn 2021-03-02 11:47:00 -05:00
parent 955a3f9ad5
commit 2c26d77d98
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.root.dist
View File

@ -18,8 +18,6 @@
rockchip tags=package=runtime rockchip tags=package=runtime
.. ..
.. ..
efi
..
firmware firmware
.. ..
loader.conf.d tags=package=bootloader loader.conf.d tags=package=bootloader

1
release/tools/arm.subr
View File

@ -184,6 +184,7 @@ arm_install_base() {
TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
${CONF_FILES} installworld installkernel distribution ${CONF_FILES} installworld installkernel distribution
chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi
chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
arm_create_user arm_create_user