svn commit: r315357 - in stable/11: rescue/rescue tools/build/mk

[Ngie Cooper]

Author: ngie
Date: Thu Mar 16 02:04:13 2017
New Revision: 315357
URL: https://svnweb.freebsd.org/changeset/base/315357

Log:
  MFC r315113:
  
  Conditionally compile [additional] programs into rescue(8) if requested
  
  Trivial oversight missed in r314240 cleanup because I enable these knobs on
  my test machines.
  
  MK_INET6_SUPPORT - rtsol
  MK_NETCAT - nc

Modified:
  stable/11/rescue/rescue/Makefile
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/rescue/rescue/Makefile
==============================================================================
--- stable/11/rescue/rescue/Makefile	Thu Mar 16 02:02:33 2017	(r315356)
+++ stable/11/rescue/rescue/Makefile	Thu Mar 16 02:04:13 2017	(r315357)
@@ -98,7 +98,7 @@ CRUNCH_PROGS_sbin= badsect					\
 	mount_msdosfs mount_nfs mount_nullfs			\
 	mount_udf mount_unionfs newfs				\
 	newfs_msdos nos-tun ping reboot				\
-	restore rcorder route rtsol savecore	 		\
+	restore rcorder route savecore		 		\
 	shutdown spppcontrol swapon sysctl tunefs umount
 
 .if ${MK_ATM} != "no"
@@ -111,6 +111,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
 
 .if ${MK_INET6_SUPPORT} != "no"
 CRUNCH_PROGS_sbin+= ping6
+CRUNCH_PROGS_sbin+= rtsol
 .endif
 
 .if ${MK_IPFILTER} != "no"
@@ -190,7 +191,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRU
 #
 CRUNCH_SRCDIRS+= usr.bin
 
-CRUNCH_PROGS_usr.bin= head mt nc sed tail tee
+CRUNCH_PROGS_usr.bin= head mt sed tail tee
 
 CRUNCH_PROGS_usr.bin+= gzip
 CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@@ -212,6 +213,10 @@ CRUNCH_LIBS+= -lcrypto
 .endif
 CRUNCH_LIBS+= -lmd
 
+.if ${MK_NETCAT} != "no"
+CRUNCH_PROGS_usr.bin= nc
+.endif
+
 .if ${MK_VI} != "no"
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Thu Mar 16 02:02:33 2017	(r315356)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Thu Mar 16 02:04:13 2017	(r315357)
@@ -3187,6 +3187,7 @@ OLD_FILES+=usr/share/man/man8/traceroute
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
+OLD_FILES+=rescue/rtsol
 .endif
 
 .if ${MK_INETD} == no
@@ -6316,6 +6317,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NETCAT} == no
+OLD_FILES+=rescue/nc
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif