svn commit: r278717 - in stable/10: etc/rc.d sbin share/man/man4 share/mk sys/modules/geom tools/build/mk tools/build/options

[Garrett Cooper]

Author: ngie
Date: Fri Feb 13 21:32:05 2015
New Revision: 278717
URL: https://svnweb.freebsd.org/changeset/base/278717

Log:
  MFC r277678:
  
  r277678:
  
    Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc
  
    Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/tools/build/options/WITHOUT_CCD
     - copied unchanged from r277678, head/tools/build/options/WITHOUT_CCD
Modified:
  stable/10/etc/rc.d/Makefile
  stable/10/sbin/Makefile
  stable/10/share/man/man4/Makefile
  stable/10/share/mk/bsd.own.mk
  stable/10/sys/modules/geom/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/etc/rc.d/Makefile	Fri Feb 13 21:32:05 2015	(r278717)
@@ -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

Modified: stable/10/sbin/Makefile
==============================================================================
--- stable/10/sbin/Makefile	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/sbin/Makefile	Fri Feb 13 21:32:05 2015	(r278717)
@@ -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

Modified: stable/10/share/man/man4/Makefile
==============================================================================
--- stable/10/share/man/man4/Makefile	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/share/man/man4/Makefile	Fri Feb 13 21:32:05 2015	(r278717)
@@ -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

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/share/mk/bsd.own.mk	Fri Feb 13 21:32:05 2015	(r278717)
@@ -266,6 +266,7 @@ __DEFAULT_YES_OPTIONS = \
     BZIP2 \
     CALENDAR \
     CAPSICUM \
+    CCD \
     CDDL \
     CPP \
     CROSS_COMPILER \

Modified: stable/10/sys/modules/geom/Makefile
==============================================================================
--- stable/10/sys/modules/geom/Makefile	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/sys/modules/geom/Makefile	Fri Feb 13 21:32:05 2015	(r278717)
@@ -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>

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Feb 13 21:31:43 2015	(r278716)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Feb 13 21:32:05 2015	(r278717)
@@ -492,6 +492,13 @@ OLD_FILES+=usr/share/calendar/uk_UA.KOI8
 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

Copied: stable/10/tools/build/options/WITHOUT_CCD (from r277678, head/tools/build/options/WITHOUT_CCD)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_CCD	Fri Feb 13 21:32:05 2015	(r278717, copy of r277678, head/tools/build/options/WITHOUT_CCD)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr geom_ccd 4
+and related utilities.