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

Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc

Browse Source 
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-01-25 04:52:48 +00:00
parent e45b569c95
commit 18cc317233
8 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/rc.d/Makefile
View File

@ -30,7 +30,6 @@ FILES= DAEMON \
bsnmpd \
${_bthidd} \
${_casperd} \
ccd \
cleanvar \
cleartmp \
cron \
@ -172,6 +171,10 @@ _ubthidhci= ubthidhci
_casperd= casperd
.endif
.if ${MK_CCD} != "no"
FILES+= ccd
.endif
.if ${MK_ISCSI} != "no"
FILES+= iscsictl
FILES+= iscsid

5
sbin/Makefile
View File

@ -8,7 +8,6 @@
SUBDIR=adjkerntz \
badsect \
camcontrol \
ccdconfig \
clri \
comcontrol \
conscontrol \
@ -81,6 +80,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 \
@ -858,6 +858,10 @@ _nvram2env.4= nvram2env.4
SUBDIR= man4.${MACHINE_CPUARCH}
.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

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

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

@ -24,6 +24,7 @@
__DEFAULT_YES_OPTIONS = \
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

@ -398,6 +398,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

4
tools/build/options/WITHOUT_CCD Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build
.Xr geom_ccd 4
and related utilities.