diff options
author | ngie <ngie@FreeBSD.org> | 2015-01-25 04:52:48 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-01-25 04:52:48 +0000 |
commit | ed476849d331bd54d76f9e5652537bbb9fa233a4 (patch) | |
tree | 6f0504e58df3d511227df3c604c610832ddb7fea | |
parent | b7d970adae001cb6bee81cfb7e348f39ed6c66d2 (diff) | |
download | FreeBSD-src-ed476849d331bd54d76f9e5652537bbb9fa233a4.zip FreeBSD-src-ed476849d331bd54d76f9e5652537bbb9fa233a4.tar.gz |
Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
-rw-r--r-- | sbin/Makefile | 5 | ||||
-rw-r--r-- | share/man/man4/Makefile | 6 | ||||
-rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
-rw-r--r-- | sys/conf/kern.opts.mk | 1 | ||||
-rw-r--r-- | sys/modules/geom/Makefile | 8 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 | ||||
-rw-r--r-- | tools/build/options/WITHOUT_CCD | 4 |
8 files changed, 33 insertions, 4 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index bb10868..465f341 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/sbin/Makefile b/sbin/Makefile index ae0db29..1c34e0c 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -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 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5c07303..8bfd875 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0fcf0cc..8082b14 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -63,6 +63,7 @@ __DEFAULT_YES_OPTIONS = \ CALENDAR \ CAPSICUM \ CASPER \ + CCD \ CDDL \ CPP \ CROSS_COMPILER \ diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 63e8510..8b35679 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -24,6 +24,7 @@ __DEFAULT_YES_OPTIONS = \ BLUETOOTH \ + CCD \ CDDL \ CRYPT \ FORMAT_EXTENSIONS \ diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index a94f760..f54a3e8 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -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> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 110275f..66c331b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/tools/build/options/WITHOUT_CCD b/tools/build/options/WITHOUT_CCD new file mode 100644 index 0000000..b4d044e --- /dev/null +++ b/tools/build/options/WITHOUT_CCD @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr geom_ccd 4 +and related utilities. |