Date: Fri, 13 Feb 2015 21:36:17 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278718 - in stable/9: etc/rc.d sbin share/man/man4 share/mk sys/modules/geom tools/build/mk tools/build/options Message-ID: <201502132136.t1DLaHLi008470@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Feb 13 21:36:16 2015 New Revision: 278718 URL: https://svnweb.freebsd.org/changeset/base/278718 Log: MFC r278717: r278717: MFC r277678: r277678: Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc Sponsored by: EMC / Isilon Storage Division Added: stable/9/tools/build/options/WITHOUT_CCD - copied unchanged from r278717, stable/10/tools/build/options/WITHOUT_CCD Modified: stable/9/etc/rc.d/Makefile stable/9/sbin/Makefile stable/9/share/man/man4/Makefile stable/9/share/mk/bsd.own.mk stable/9/sys/modules/geom/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) stable/9/etc/rc.d/ (props changed) stable/9/sbin/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/share/mk/ (props changed) stable/9/sys/ (props changed) stable/9/sys/modules/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) stable/9/tools/build/options/ (props changed) Modified: stable/9/etc/rc.d/Makefile ============================================================================== --- stable/9/etc/rc.d/Makefile Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/etc/rc.d/Makefile Fri Feb 13 21:36:16 2015 (r278718) @@ -21,7 +21,6 @@ FILES= DAEMON \ bootparams \ bridge \ ${_bthidd} \ - ccd \ cleanvar \ cleartmp \ cron \ @@ -169,6 +168,10 @@ FILES+= apmd FILES+= bsnmpd .endif +.if ${MK_CCD} != "no" +FILES+= ccd +.endif + .if ${MK_IPX} != "no" _ipxrouted= ipxrouted .endif Modified: stable/9/sbin/Makefile ============================================================================== --- stable/9/sbin/Makefile Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/sbin/Makefile Fri Feb 13 21:36:16 2015 (r278718) @@ -9,7 +9,6 @@ SUBDIR=adjkerntz \ atacontrol \ badsect \ camcontrol \ - ccdconfig \ clri \ comcontrol \ conscontrol \ @@ -78,6 +77,10 @@ SUBDIR=adjkerntz \ SUBDIR+= atm .endif +.if ${MK_CCD} != "no" +SUBDIR+= ccdconfig +.endif + .if ${MK_CXX} != "no" SUBDIR+= devd .endif Modified: stable/9/share/man/man4/Makefile ============================================================================== --- stable/9/share/man/man4/Makefile Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/share/man/man4/Makefile Fri Feb 13 21:36:16 2015 (r278718) @@ -84,7 +84,7 @@ MAN= aac.4 \ cc_htcp.4 \ cc_newreno.4 \ cc_vegas.4 \ - ccd.4 \ + ${_ccd.4} \ cd.4 \ cdce.4 \ ch.4 \ @@ -800,4 +800,8 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_CCD} != "no" +_ccd.4= ccd.4 +.endif + .include <bsd.prog.mk> Modified: stable/9/share/mk/bsd.own.mk ============================================================================== --- stable/9/share/mk/bsd.own.mk Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/share/mk/bsd.own.mk Fri Feb 13 21:36:16 2015 (r278718) @@ -351,6 +351,7 @@ __DEFAULT_YES_OPTIONS = \ SOURCELESS_UCODE \ BZIP2 \ CALENDAR \ + CCD \ CDDL \ CPP \ CRYPT \ Modified: stable/9/sys/modules/geom/Makefile ============================================================================== --- stable/9/sys/modules/geom/Makefile Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/sys/modules/geom/Makefile Fri Feb 13 21:36:16 2015 (r278718) @@ -1,9 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= geom_bde \ geom_bsd \ geom_cache \ - geom_ccd \ geom_concat \ geom_eli \ geom_fox \ @@ -30,4 +31,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/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:32:05 2015 (r278717) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:36:16 2015 (r278718) @@ -661,6 +661,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/9/tools/build/options/WITHOUT_CCD (from r278717, stable/10/tools/build/options/WITHOUT_CCD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/build/options/WITHOUT_CCD Fri Feb 13 21:36:16 2015 (r278718, copy of r278717, stable/10/tools/build/options/WITHOUT_CCD) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr geom_ccd 4 +and related utilities.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502132136.t1DLaHLi008470>