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

loader: install help files only once

Browse Source 
Every file should be installed exactly once by `make installworld`.
This is especially important for pkgbase.

Loader help files were being installed by each loader variant (e.g.,
the simp, lua, and 4th EFI loaders).  Add a (slightly hacky) mechanism
to skip installing help files for all but one variant.

PR:		271178
Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40021
This commit is contained in:
Ed Maste 2023-05-05 13:43:33 -04:00
parent c55b7e5226
commit e32fecd0c2
7 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stand/efi/loader_4th/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=4th
INSTALL_LOADER_HELP_FILE=no
.include "../loader/Makefile"

1
stand/efi/loader_lua/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=lua
INSTALL_LOADER_HELP_FILE=no
.include "../loader/Makefile"

1
stand/i386/loader_4th/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=4th
INSTALL_LOADER_HELP_FILE=no
.include "../loader/Makefile"

1
stand/i386/loader_lua/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=lua
INSTALL_LOADER_HELP_FILE=no
.include "../loader/Makefile"

2
stand/loader.mk
View File

@ -171,8 +171,10 @@ CFLAGS+= -DELF_VERBOSE
HELP_FILES+= ${LDRSRC}/help.common
CFLAGS+= -DHELP_FILENAME=\"${HELP_FILENAME}\"
.if ${INSTALL_LOADER_HELP_FILE:Uyes} == "yes"
CLEANFILES+= ${HELP_FILENAME}
FILES+= ${HELP_FILENAME}
.endif
${HELP_FILENAME}: ${HELP_FILES}
cat ${HELP_FILES} | awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}

1
stand/userboot/userboot_4th/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=4th
INSTALL_LOADER_HELP_FILE=no
.include "../userboot/Makefile"

1
stand/userboot/userboot_lua/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$
LOADER_INTERP=lua
INSTALL_LOADER_HELP_FILE=no
.include "../userboot/Makefile"