diff options
author | ngie <ngie@FreeBSD.org> | 2017-03-12 04:12:41 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-03-12 04:12:41 +0000 |
commit | fb8a3dead798613fa08521ac374815bc80412eee (patch) | |
tree | 15b0341868adcc9d47b34335a0d6f3a91ac96b34 | |
parent | e20302108fb14821aee3098d2e2e4fca4ea31214 (diff) | |
download | FreeBSD-src-fb8a3dead798613fa08521ac374815bc80412eee.zip FreeBSD-src-fb8a3dead798613fa08521ac374815bc80412eee.tar.gz |
MFC r314240:
Conditionally compile certain programs into rescue(8) if requested
MK_CCD - ccdconfig
MK_ROUTED - routed, rtquery
-rw-r--r-- | rescue/rescue/Makefile | 13 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 04aae98..5a79d45 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -89,7 +89,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 \ @@ -97,13 +97,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 \ 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 @@ -111,6 +115,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 1c8de9a..4cd05aa5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -801,6 +801,7 @@ OLD_DIRS+=usr/tests/usr.bin/calendar .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 @@ -4437,6 +4438,8 @@ OLD_DIRS+=usr/tests/usr.sbin/etcupdate #.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 |