svn commit: r335386 - in head: share/examples tools/build/mk usr.sbin

[Sean Bruno]

Author: sbruno
Date: Tue Jun 19 21:07:25 2018
New Revision: 335386
URL: https://svnweb.freebsd.org/changeset/base/335386

Log:
  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

Modified:
  head/share/examples/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/Makefile

Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile	Tue Jun 19 20:32:43 2018	(r335385)
+++ head/share/examples/Makefile	Tue Jun 19 21:07:25 2018	(r335386)
@@ -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

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jun 19 20:32:43 2018	(r335385)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jun 19 21:07:25 2018	(r335386)
@@ -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

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Tue Jun 19 20:32:43 2018	(r335385)
+++ head/usr.sbin/Makefile	Tue Jun 19 21:07:25 2018	(r335386)
@@ -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