MK_EFI - Add uefisign and friends to this knob and ensure that we don't

try to build them if MK_OPENSSL is unset.

Reviewed by:	emaste imp kevans
Sponsored by:	Limelight Networks
Differential Revision:	https://reviews.freebsd.org/D15211
This commit is contained in:
sbruno 2018-06-19 21:07:25 +00:00
parent 06f56d598b
commit a5206a2a79
3 changed files with 14 additions and 2 deletions
share/examples
tools/build/mk
usr.sbin

View File

@ -31,7 +31,6 @@ LDIRS= BSD_daemon \
ses \
scsi_target \
sunrpc \
uefisign \
ypldap
@ -343,8 +342,11 @@ SE_SUNRPC_SORT= \
sort.x \
sort_proc.c
.if ${MK_EFI} != "no"
LDIRS+= uefisign
SE_DIRS+= uefisign
SE_UEFISIGN= uefikeys
.endif
SE_DIRS+= ypldap
SE_YPLDAP= ypldap.conf

View File

@ -1614,6 +1614,14 @@ OLD_DIRS+=usr/share/bsdconfig/timezone
OLD_DIRS+=usr/share/bsdconfig/usermgmt
.endif
.if ${MK_EFI} == no
OLD_FILES+=usr/sbin/efibootmgr
OLD_FILES+=usr/sbin/efidp
OLD_FILES+=usr/sbin/efivar
OLD_FILES+=usr/sbin/uefisign
OLD_FILES+=usr/share/examples/uefisign/uefikeys
.endif
.if ${MK_FMTREE} == no
OLD_FILES+=usr/sbin/fmtree
OLD_FILES+=usr/share/man/man8/fmtree.8.gz

View File

@ -92,7 +92,6 @@ SUBDIR= adduser \
traceroute \
trpt \
tzsetup \
uefisign \
ugidfw \
vigr \
vipw \
@ -126,6 +125,9 @@ SUBDIR.${MK_CTM}+= ctm
SUBDIR.${MK_CXGBETOOL}+= cxgbetool
SUBDIR.${MK_DIALOG}+= bsdconfig
SUBDIR.${MK_EFI}+= efivar efidp efibootmgr
.if ${MK_OPENSSL} != "no"
SUBDIR.${MK_EFI}+= uefisign
.endif
SUBDIR.${MK_FLOPPY}+= fdcontrol
SUBDIR.${MK_FLOPPY}+= fdformat
SUBDIR.${MK_FLOPPY}+= fdread