diff options
| -rw-r--r-- | etc/rc.d/Makefile | 9 | ||||
| -rw-r--r-- | sbin/Makefile | 5 | ||||
| -rw-r--r-- | share/man/man4/Makefile | 6 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | sys/modules/geom/Makefile | 7 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_CCD | 4 |
7 files changed, 33 insertions, 6 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 435104e..fe6c664 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -21,7 +21,6 @@ FILES= DAEMON \ bootparams \ bridge \ ${_bthidd} \ - ccd \ cleanvar \ cleartmp \ cron \ @@ -185,14 +184,18 @@ _ubthidhci= ubthidhci FILES+= bsnmpd .endif -.if ${MK_IPX} != "no" -_ipxrouted= ipxrouted +.if ${MK_CCD} != "no" +FILES+= ccd .endif .if ${MK_HAST} != "no" FILES+= hastd .endif +.if ${MK_IPX} != "no" +_ipxrouted= ipxrouted +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid diff --git a/sbin/Makefile b/sbin/Makefile index 74659cc..3c24934 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -8,7 +8,6 @@ SUBDIR=adjkerntz \ badsect \ camcontrol \ - ccdconfig \ clri \ comcontrol \ conscontrol \ @@ -75,6 +74,10 @@ SUBDIR=adjkerntz \ SUBDIR+= atm .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 8a7165b..c1e5154 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 \ @@ -862,6 +862,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/bsd.own.mk b/share/mk/bsd.own.mk index 5cccf9f..e2aa966 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -266,6 +266,7 @@ __DEFAULT_YES_OPTIONS = \ BZIP2 \ CALENDAR \ CAPSICUM \ + CCD \ CDDL \ CPP \ CROSS_COMPILER \ diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index 7416640..f803af0 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= geom_bde \ geom_bsd \ geom_cache \ - geom_ccd \ geom_concat \ geom_eli \ geom_fox \ @@ -31,4 +32,8 @@ SUBDIR= geom_bde \ geom_vol_ffs \ 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 53695f9..28dbd9f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -492,6 +492,13 @@ OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox OLD_FILES+=usr/share/man/man1/calendar.1.gz .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. |
