From 8fe6149c08b6c69fced6e1929060f99aeb73a723 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 16 Mar 2017 02:02:33 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@315356 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 rescue/rescue/Makefile                   | 9 +++++++--
 tools/build/mk/OptionalObsoleteFiles.inc | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 6981e94e8..67414f9f0 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -97,7 +97,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"
@@ -110,6 +110,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
 
 .if ${MK_INET6_SUPPORT} != "no"
 CRUNCH_PROGS_sbin+= ping6
+CRUNCH_PROGS_sbin+= rtsol
 .endif
 
 .if ${MK_IPFILTER} != "no"
@@ -196,7 +197,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint
 #
 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
@@ -218,6 +219,10 @@ CRUNCH_LIBS+= -lcrypto
 .endif
 CRUNCH_LIBS+= -lmd
 
+.if ${MK_NETCAT} != "no"
+CRUNCH_PROGS_usr.bin= nc
+.endif
+
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c866f94eb..c79d2f257 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2487,6 +2487,7 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
+OLD_FILES+=rescue/rtsol
 .endif
 
 #.if ${MK_INFO} == no
@@ -3887,6 +3888,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
-- 
2.42.0