diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2021-02-11 14:29:00 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2023-02-03 20:35:06 +0000 |
| commit | 8859960436f5727f163a7b3468e08710c5e6d874 (patch) | |
| tree | 1034760ec765f6d8a87c6dfa8d039a223c26a053 /stand/uboot | |
| parent | 09d3671b0e32774d9267781bd0c0d8196dbed6c0 (diff) | |
| download | src-8859960436f5727f163a7b3468e08710c5e6d874.tar.gz src-8859960436f5727f163a7b3468e08710c5e6d874.zip | |
loader: always install help files
Address two issues with current help file logic:
The existing condition prevents the common help file from being
installed when there are no additional help files defined. This results
in no loader.help on EFI platforms, for example.
Second, due to the fact that we build and install multiple loader types,
each successive install will clobber the previous loader.help. The
result is that we could lose type-specific commands, or possibly list
them in loaders that do not have such commands.
Instead, give each loader type a uniquely named help file. The EFI
loader will look for /boot/loader.help.efi, userboot will look for
/boot/loader.help.userboot, etc. The interpreter variant has no effect
on which help file is loaded.
This leaves the old /boot/loader.help unused.
Some credit for the final approach goes to Mathieu <sigsys@gmail.com>
for their version of the fix in https://reviews.freebsd.org/D22951.
PR: 267134
Reported by: Daniel O'Connor <darius@dons.net.au>
Reviewed by: imp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D28591
Diffstat (limited to 'stand/uboot')
| -rw-r--r-- | stand/uboot/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index ed2253cdae6f..5b8275a0131b 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -35,7 +35,8 @@ WARNS?= 1 CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized .endif -HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt +HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt +HELP_FILENAME= loader.help.uboot # Always add MI sources .include "${BOOTSRC}/loader.mk" |