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

Make ccd(4), et al conditional based on MK_CCD

Browse Source
This commit is contained in:
Enji Cooper 2014-12-02 19:53:55 +00:00
parent 488ced8671
commit 210607205f
7 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rc.d/Makefile
View File

@ -20,7 +20,6 @@ FILES= DAEMON \
${_bsnmpd} \
${_bthidd} \
${_casperd} \
ccd \
cleanvar \
cleartmp \
cron \
@ -167,6 +166,10 @@ _bsnmpd= bsnmpd
_casperd= casperd
.endif
.if ${MK_CCD} != "no"
FILES+= ccd
.endif
.if ${MK_FTP} != "no"
FILES+= ftpd
.endif
@ -226,10 +229,6 @@ FILES+= lpd
FILES+= ugidfw
.endif
.if ${MK_NS_CACHING} != "no"
_nscd= nscd
.endif
.if ${MK_KERBEROS} != "no"
FILES+= ipropd_master
FILES+= ipropd_slave
@ -260,6 +259,10 @@ FILES+= ypupdated
FILES+= ypxfrd
.endif
.if ${MK_NS_CACHING} != "no"
_nscd= nscd
.endif
.if ${MK_NTP} != "no"
FILES+= ntpd
FILES+= ntpdate

5
sbin/Makefile
View File

@ -8,7 +8,6 @@
SUBDIR=adjkerntz \
badsect \
camcontrol \
ccdconfig \
clri \
comcontrol \
conscontrol \
@ -78,6 +77,10 @@ SUBDIR+= atm
SUBDIR+= casperd
.endif
.if ${MK_CCD} != "no"
SUBDIR+= ccdconfig
.endif
.if ${MK_CXX} != "no"
SUBDIR+= devd
.endif

6
share/man/man4/Makefile
View File

@ -91,7 +91,7 @@ MAN= aac.4 \
cc_htcp.4 \
cc_newreno.4 \
cc_vegas.4 \
ccd.4 \
${_ccd.4} \
cd.4 \
cdce.4 \
ch.4 \
@ -743,6 +743,10 @@ SUBDIR= man4.${MACHINE_CPUARCH}
_bhyve.4= bhyve.4
.endif
.if ${MK_CCD} != "no"
_ccd.4= ccd.4
.endif
.if ${MK_ISCSI} != "no"
MAN+= iscsi.4
MAN+= iscsi_initiator.4

1
share/mk/src.opts.mk
View File

@ -67,6 +67,7 @@ __DEFAULT_YES_OPTIONS = \
CALENDAR \
CAPSICUM \
CASPER \
CCD \
CDDL \
CPP \
CROSS_COMPILER \

1
sys/conf/kern.opts.mk
View File

@ -25,6 +25,7 @@
__DEFAULT_YES_OPTIONS = \
AUTOFS \
BLUETOOTH \
CCD \
CDDL \
CRYPT \
FORMAT_EXTENSIONS \

8
sys/modules/geom/Makefile
View File

@ -1,8 +1,10 @@
# $FreeBSD$
SYSDIR?=${.CURDIR}/../..
.include "${SYSDIR}/conf/kern.opts.mk"
SUBDIR= geom_bde \
geom_cache \
geom_ccd \
geom_concat \
geom_eli \
geom_gate \
@ -25,4 +27,8 @@ SUBDIR= geom_bde \
geom_virstor \
geom_zero
.if ${MK_CCD} != "no" || defined(ALL_MODULES)
SUBDIR+= geom_ccd
.endif
.include <bsd.subdir.mk>

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

@ -934,6 +934,13 @@ OLD_FILES+=sbin/casper
OLD_FILES+=usr/lib/libcasper.a
.endif
.if ${MK_CCD} == no
OLD_FILES+=etc/rc.d/ccd
OLD_FILES+=sbin/ccdconfig
OLD_FILES+=usr/share/man/man4/ccd.4.gz
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
.endif
.if ${MK_CDDL} == no
OLD_LIBS+=lib/libavl.so.2
OLD_LIBS+=lib/libctf.so.2