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

Move loader help file definitions to being 100% inside of loader.mk.

Browse Source 
HELP_FILES is a loader only thing, so move it to loader.mk. Only
generate the help file if HELP_FILES is defined. Adjust Makefiles to
new convention. Fix a few cases where ${.CURDIR}/ was missing
resulting in missing bits from the help files.

Sponsored by: Netflix
This commit is contained in:
imp 2017-12-18 04:51:34 +00:00
parent e7c1464d29
commit 3e70882dcb
13 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/arm/uboot/Makefile
View File

@ -28,7 +28,7 @@ SRCS= start.S conf.c self_reloc.c vers.c
CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized
.endif
HELP_FILES+= help.uboot ${BOOTSRC}/fdt/help.fdt
HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
# Always add MI sources
.include "${BOOTSRC}/loader.mk"

4
stand/defs.mk
View File

@ -170,8 +170,4 @@ ${_ILINKS}:
${ECHO} ${.TARGET:T} "->" $$path ; \
ln -fhs $$path ${.TARGET:T}
# For loader implementations, we generate a loader.help file. This can be suppressed by
# setting HELP_FILES to nothing.
HELP_FILES= ${LDRSRC}/help.common
.endif # __BOOT_DEFS_MK__

1
stand/efi/loader/Makefile
View File

@ -83,7 +83,6 @@ CFLAGS+= -DEFI_STAGING_SIZE=${EFI_STAGING_SIZE}
.endif
# Always add MI sources
HELP_FILES=
.include "${BOOTSRC}/loader.mk"
FILES+= loader.efi

4
stand/i386/loader/Makefile
View File

@ -41,9 +41,7 @@ LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a
.endif
.if exists(${.CURDIR}/help.i386)
HELP_FILES+= help.i386
.else
HELP_FILES=
HELP_FILES= ${.CURDIR}/help.i386
.endif
# Always add MI sources

2
stand/loader.mk
View File

@ -139,6 +139,8 @@ vers.c: ${LDRSRC}/newvers.sh ${VERSION_FILE}
${NEWVERSWHAT}
.if !empty(HELP_FILES)
HELP_FILES+= ${LDRSRC}/help.common
CLEANFILES+= loader.help
FILES+= loader.help

2
stand/mips/beri/loader/Makefile
View File

@ -67,7 +67,7 @@ SRCS+= altera_jtag_uart.c \
# Since we don't have a backward compatibility issue, default to this on BERI.
CFLAGS+= -DBOOT_PROMPT_123
HELP_FILES+= ${.CURDIR}/help.mips
HELP_FILES= ${.CURDIR}/help.mips
# Always add MI sources
.include "${BOOTSRC}/loader.mk"

2
stand/mips/uboot/Makefile
View File

@ -24,7 +24,7 @@ UBLDR_LOADADDR?= 0xffffffff80800000
# Architecture-specific loader code
SRCS= start.S conf.c vers.c
HELP_FILES+= help.uboot ${BOOTSRC}/fdt/help.fdt
HELP_FILES= ${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
# Always add MI sources
.include "${BOOTSRC}/loader.mk"

3
stand/powerpc/kboot/Makefile
View File

@ -28,7 +28,6 @@ SRCS+= ucmpdi2.c
CFLAGS+= -mcpu=powerpc64
# Always add MI sources
HELP_FILES= # Disable
.include "${BOOTSRC}/loader.mk"
.PATH: ${SYSDIR}/libkern
@ -45,6 +44,4 @@ CFLAGS+= -Wa,-mppc64bridge
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
HELP_FILES+= ${FDTSRC}/help.fdt
.include <bsd.prog.mk>

2
stand/powerpc/ofw/Makefile
View File

@ -27,7 +27,7 @@ SRCS+= ucmpdi2.c
SRCS+= ofwfdt.c
.endif
HELP_FILES+= ${FDTSRC}/help.fdt
HELP_FILES= ${FDTSRC}/help.fdt
# Always add MI sources
.include "${BOOTSRC}/loader.mk"

1
stand/powerpc/ps3/Makefile
View File

@ -26,7 +26,6 @@ SRCS+= ucmpdi2.c
CFLAGS+= -mcpu=powerpc64
# Always add MI sources
HELP_FILES= # Disable
.include "${BOOTSRC}/loader.mk"
.PATH: ${SYSDIR}/libkern

1
stand/powerpc/uboot/Makefile
View File

@ -21,7 +21,6 @@ SRCS= start.S conf.c vers.c
SRCS+= ucmpdi2.c
# Always add MI sources
HELP_FILES= # Disable
.include "${BOOTSRC}/loader.mk"
.PATH: ${SYSDIR}/libkern

4
stand/sparc64/loader/Makefile
View File

@ -30,9 +30,7 @@ CFLAGS+= -DLOADER_DEBUG
.endif
.if exists(${.CURDIR}/help.sparc64)
HELP_FILES+= help.sparc64
.else
HELP_FILES=
HELP_FILES= ${.CURDIR}/help.sparc64
.endif
# Always add MI sources

1
stand/userboot/userboot/Makefile
View File

@ -49,7 +49,6 @@ LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a
.endif
# Always add MI sources
HELP_FILES= # Disable
.include "${BOOTSRC}/loader.mk"
CFLAGS+= -I.
DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA}