Author: ngie
Date: Sun Jan 25 04:52:48 2015
New Revision: 277678
URL: https://svnweb.freebsd.org/changeset/base/277678
Log:
Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_CCD (contents, props changed)
Modified:
head/etc/rc.d/Makefile
head/sbin/Makefile
head/share/man/man4/Makefile
head/share/mk/src.opts.mk
head/sys/conf/kern.opts.mk
head/sys/modules/geom/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile Sun Jan 25 04:43:13 2015 (r277677)
+++ head/etc/rc.d/Makefile Sun Jan 25 04:52:48 2015 (r277678)
@@ -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
Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile Sun Jan 25 04:43:13 2015 (r277677)
+++ head/sbin/Makefile Sun Jan 25 04:52:48 2015 (r277678)
@@ -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
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Sun Jan 25 04:43:13 2015
(r277677)
+++ head/share/man/man4/Makefile Sun Jan 25 04:52:48 2015
(r277678)
@@ -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
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Sun Jan 25 04:43:13 2015 (r277677)
+++ head/share/mk/src.opts.mk Sun Jan 25 04:52:48 2015 (r277678)
@@ -63,6 +63,7 @@ __DEFAULT_YES_OPTIONS = \
CALENDAR \
CAPSICUM \
CASPER \
+ CCD \
CDDL \
CPP \
CROSS_COMPILER \
Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk Sun Jan 25 04:43:13 2015 (r277677)
+++ head/sys/conf/kern.opts.mk Sun Jan 25 04:52:48 2015 (r277678)
@@ -24,6 +24,7 @@
__DEFAULT_YES_OPTIONS = \
BLUETOOTH \
+ CCD \
CDDL \
CRYPT \
FORMAT_EXTENSIONS \
Modified: head/sys/modules/geom/Makefile
==============================================================================
--- head/sys/modules/geom/Makefile Sun Jan 25 04:43:13 2015
(r277677)
+++ head/sys/modules/geom/Makefile Sun Jan 25 04:52:48 2015
(r277678)
@@ -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>
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 04:43:13
2015 (r277677)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 04:52:48
2015 (r277678)
@@ -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
Added: head/tools/build/options/WITHOUT_CCD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_CCD Sun Jan 25 04:52:48 2015
(r277678)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr geom_ccd 4
+and related utilities.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
