Date: Mon, 18 Dec 2017 04:51:34 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326926 - in head/stand: . arm/uboot efi/loader i386/loader mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/loader userboot/userboot Message-ID: <201712180451.vBI4pYFB093448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Dec 18 04:51:34 2017 New Revision: 326926 URL: https://svnweb.freebsd.org/changeset/base/326926 Log: Move loader help file definitions to being 100% inside of loader.mk. 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 Modified: head/stand/arm/uboot/Makefile head/stand/defs.mk head/stand/efi/loader/Makefile head/stand/i386/loader/Makefile head/stand/loader.mk head/stand/mips/beri/loader/Makefile head/stand/mips/uboot/Makefile head/stand/powerpc/kboot/Makefile head/stand/powerpc/ofw/Makefile head/stand/powerpc/ps3/Makefile head/stand/powerpc/uboot/Makefile head/stand/sparc64/loader/Makefile head/stand/userboot/userboot/Makefile Modified: head/stand/arm/uboot/Makefile ============================================================================== --- head/stand/arm/uboot/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/arm/uboot/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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" Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/defs.mk Mon Dec 18 04:51:34 2017 (r326926) @@ -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__ Modified: head/stand/efi/loader/Makefile ============================================================================== --- head/stand/efi/loader/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/efi/loader/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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 Modified: head/stand/i386/loader/Makefile ============================================================================== --- head/stand/i386/loader/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/i386/loader/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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 Modified: head/stand/loader.mk ============================================================================== --- head/stand/loader.mk Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/loader.mk Mon Dec 18 04:51:34 2017 (r326926) @@ -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 Modified: head/stand/mips/beri/loader/Makefile ============================================================================== --- head/stand/mips/beri/loader/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/mips/beri/loader/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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" Modified: head/stand/mips/uboot/Makefile ============================================================================== --- head/stand/mips/uboot/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/mips/uboot/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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" Modified: head/stand/powerpc/kboot/Makefile ============================================================================== --- head/stand/powerpc/kboot/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/powerpc/kboot/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -28,7 +28,6 @@ SRCS+= ucmpdi2.c CFLAGS+= -mcpu=powerpc64 # Always add MI sources -HELP_FILES= # Disable .include "${BOOTSRC}/loader.mk" .PATH: ${SYSDIR}/libkern @@ -44,7 +43,5 @@ CFLAGS+= -Wa,-mppc64bridge DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA} - -HELP_FILES+= ${FDTSRC}/help.fdt .include <bsd.prog.mk> Modified: head/stand/powerpc/ofw/Makefile ============================================================================== --- head/stand/powerpc/ofw/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/powerpc/ofw/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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" Modified: head/stand/powerpc/ps3/Makefile ============================================================================== --- head/stand/powerpc/ps3/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/powerpc/ps3/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -26,7 +26,6 @@ SRCS+= ucmpdi2.c CFLAGS+= -mcpu=powerpc64 # Always add MI sources -HELP_FILES= # Disable .include "${BOOTSRC}/loader.mk" .PATH: ${SYSDIR}/libkern Modified: head/stand/powerpc/uboot/Makefile ============================================================================== --- head/stand/powerpc/uboot/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/powerpc/uboot/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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 Modified: head/stand/sparc64/loader/Makefile ============================================================================== --- head/stand/sparc64/loader/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/sparc64/loader/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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 Modified: head/stand/userboot/userboot/Makefile ============================================================================== --- head/stand/userboot/userboot/Makefile Mon Dec 18 02:34:37 2017 (r326925) +++ head/stand/userboot/userboot/Makefile Mon Dec 18 04:51:34 2017 (r326926) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712180451.vBI4pYFB093448>