8859960436
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
71 lines
1.6 KiB
Makefile
71 lines
1.6 KiB
Makefile
# $FreeBSD$
|
|
|
|
LOADER_DISK_SUPPORT?= yes
|
|
LOADER_CD9660_SUPPORT?= yes
|
|
LOADER_MSDOS_SUPPORT?= no
|
|
LOADER_EXT2FS_SUPPORT?= yes
|
|
LOADER_UFS_SUPPORT?= yes
|
|
LOADER_ZFS_SUPPORT?= yes
|
|
LOADER_NET_SUPPORT?= no
|
|
LOADER_NFS_SUPPORT?= no
|
|
LOADER_TFTP_SUPPORT?= no
|
|
LOADER_GZIP_SUPPORT?= no
|
|
LOADER_BZIP2_SUPPORT?= no
|
|
|
|
.include <bsd.init.mk>
|
|
|
|
PROG= loader.kboot
|
|
NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH}
|
|
INSTALLFLAGS= -b
|
|
|
|
# Architecture-specific loader code
|
|
SRCS= \
|
|
bootinfo.c \
|
|
conf.c \
|
|
crt1.c \
|
|
gfx_fb_stub.c \
|
|
host_syscalls.c \
|
|
hostcons.c \
|
|
hostdisk.c \
|
|
hostfs.c \
|
|
init.c \
|
|
kbootfdt.c \
|
|
main.c \
|
|
seg.c \
|
|
termios.c \
|
|
util.c \
|
|
vers.c
|
|
|
|
CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
|
|
.if ${MK_LOADER_ZFS} != "no"
|
|
CFLAGS+= -I${ZFSSRC}
|
|
CFLAGS+= -I${SYSDIR}/contrib/openzfs/include
|
|
CFLAGS+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
|
|
HAVE_ZFS=yes
|
|
.endif
|
|
|
|
HELP_FILENAME= loader.help.kboot
|
|
|
|
.include "${BOOTSRC}/fdt.mk"
|
|
|
|
# We share bootinfo.c with efi
|
|
.PATH: ${BOOTSRC}/efi/loader
|
|
|
|
# Note: Since we're producing a userland binary, we key off of MACHINE_ARCH
|
|
# instead of the more normal MACHINE since the changes between different flavors
|
|
# of MACHINE_ARCH are large enough in Linux that it's easier that way.
|
|
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
|
|
.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
|
|
|
|
# Always add MI sources
|
|
.include "${BOOTSRC}/loader.mk"
|
|
.PATH: ${SYSDIR}/libkern
|
|
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
|
|
|
|
CFLAGS+= -Wall
|
|
|
|
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
|
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
|
|
|
.include <bsd.prog.mk>
|