d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally compile certain programs into rescue(8) if requested

Browse Source 
MK_CCD - ccdconfig
MK_ROUTED - routed, rtquery

MFC after:	2 weeks
Sponsored by:	Dell EMC Isilon
This commit is contained in:
ngie 2017-02-25 03:23:11 +00:00
parent c436f1f022
commit 53b360d5d3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rescue/rescue/Makefile
View File

@ -90,7 +90,7 @@ CRUNCH_SUPPRESS_LINK_-tcsh= 1
# #
CRUNCH_SRCDIRS+= sbin CRUNCH_SRCDIRS+= sbin
CRUNCH_PROGS_sbin= badsect \ CRUNCH_PROGS_sbin= badsect \
camcontrol ccdconfig clri devfs dmesg dump \ camcontrol clri devfs dmesg dump \
dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \ dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \
fsirand gbde geom ifconfig init \ fsirand gbde geom ifconfig init \
kldconfig kldload kldstat kldunload ldconfig \ kldconfig kldload kldstat kldunload ldconfig \
@ -98,13 +98,17 @@ CRUNCH_PROGS_sbin= badsect \
mount_msdosfs mount_nfs mount_nullfs \ mount_msdosfs mount_nfs mount_nullfs \
mount_udf mount_unionfs newfs \ mount_udf mount_unionfs newfs \
newfs_msdos nos-tun ping reboot \ newfs_msdos nos-tun ping reboot \
restore rcorder route routed rtquery rtsol savecore \ restore rcorder route rtsol savecore \
shutdown spppcontrol swapon sysctl tunefs umount shutdown spppcontrol swapon sysctl tunefs umount
.if ${MK_ATM} != "no" .if ${MK_ATM} != "no"
CRUNCH_PROGS_sbin+= atmconfig CRUNCH_PROGS_sbin+= atmconfig
.endif .endif
.if ${MK_CCD} != "no"
CRUNCH_PROGS_sbin+= ccdconfig
.endif
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"
CRUNCH_PROGS_sbin+= ping6 CRUNCH_PROGS_sbin+= ping6
.endif .endif
@ -112,6 +116,11 @@ CRUNCH_PROGS_sbin+= ping6
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf CRUNCH_PROGS_sbin+= ipf
.endif .endif
.if ${MK_ROUTED} != "no"
CRUNCH_PROGS_sbin+= routed rtquery
.endif
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= zfs CRUNCH_PROGS_sbin+= zfs
CRUNCH_PROGS_sbin+= zpool CRUNCH_PROGS_sbin+= zpool

3
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -1197,6 +1197,7 @@ OLD_FILES+=usr/share/man/man8/casperd.8.gz
.if ${MK_CCD} == no .if ${MK_CCD} == no
OLD_FILES+=etc/rc.d/ccd OLD_FILES+=etc/rc.d/ccd
OLD_FILES+=rescue/ccdconfig
OLD_FILES+=sbin/ccdconfig OLD_FILES+=sbin/ccdconfig
OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man4/ccd.4.gz
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
@ -7466,6 +7467,8 @@ OLD_FILES+=usr/share/man/man8/rwhod.8.gz
#.endif #.endif
.if ${MK_ROUTED} == no .if ${MK_ROUTED} == no
OLD_FILES+=rescue/routed
OLD_FILES+=rescue/rtquery
OLD_FILES+=sbin/routed OLD_FILES+=sbin/routed
OLD_FILES+=sbin/rtquery OLD_FILES+=sbin/rtquery
OLD_FILES+=usr/share/man/man8/routed.8.gz OLD_FILES+=usr/share/man/man8/routed.8.gz