aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-02-25 03:23:11 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-02-25 03:23:11 +0000
commit5673173e11557b39a2af664a61a9eae34e90e1f0 (patch)
tree2b1b7bd9ffe616a65045bfd7b1c7a2c250191dfd
parent6a6050accfac42c284c04a60ec8ca39dca4c484e (diff)
downloadsrc-5673173e11557b39a2af664a61a9eae34e90e1f0.tar.gz
src-5673173e11557b39a2af664a61a9eae34e90e1f0.zip
Conditionally compile certain programs into rescue(8) if requested
MK_CCD - ccdconfig MK_ROUTED - routed, rtquery MFC after: 2 weeks Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=314240
-rw-r--r--rescue/rescue/Makefile13
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc3
2 files changed, 14 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 9b4e1eecd59d..dff6710b8e5b 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -90,7 +90,7 @@ CRUNCH_SUPPRESS_LINK_-tcsh= 1
#
CRUNCH_SRCDIRS+= sbin
CRUNCH_PROGS_sbin= badsect \
- camcontrol ccdconfig clri devfs dmesg dump \
+ camcontrol clri devfs dmesg dump \
dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \
fsirand gbde geom ifconfig init \
kldconfig kldload kldstat kldunload ldconfig \
@@ -98,13 +98,17 @@ CRUNCH_PROGS_sbin= badsect \
mount_msdosfs mount_nfs mount_nullfs \
mount_udf mount_unionfs newfs \
newfs_msdos nos-tun ping reboot \
- restore rcorder route routed rtquery rtsol savecore \
+ restore rcorder route rtsol savecore \
shutdown spppcontrol swapon sysctl tunefs umount
.if ${MK_ATM} != "no"
CRUNCH_PROGS_sbin+= atmconfig
.endif
+.if ${MK_CCD} != "no"
+CRUNCH_PROGS_sbin+= ccdconfig
+.endif
+
.if ${MK_INET6_SUPPORT} != "no"
CRUNCH_PROGS_sbin+= ping6
.endif
@@ -112,6 +116,11 @@ CRUNCH_PROGS_sbin+= ping6
.if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf
.endif
+
+.if ${MK_ROUTED} != "no"
+CRUNCH_PROGS_sbin+= routed rtquery
+.endif
+
.if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= zfs
CRUNCH_PROGS_sbin+= zpool
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 09e25991a02c..e1f3d5ae0f5a 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1197,6 +1197,7 @@ OLD_FILES+=usr/share/man/man8/casperd.8.gz
.if ${MK_CCD} == no
OLD_FILES+=etc/rc.d/ccd
+OLD_FILES+=rescue/ccdconfig
OLD_FILES+=sbin/ccdconfig
OLD_FILES+=usr/share/man/man4/ccd.4.gz
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
@@ -7466,6 +7467,8 @@ OLD_FILES+=usr/share/man/man8/rwhod.8.gz
#.endif
.if ${MK_ROUTED} == no
+OLD_FILES+=rescue/routed
+OLD_FILES+=rescue/rtquery
OLD_FILES+=sbin/routed
OLD_FILES+=sbin/rtquery
OLD_FILES+=usr/share/man/man8/routed.8.gz