Date: Tue, 2 Dec 2014 19:53:56 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275421 - in projects/building-blocks: etc/rc.d sbin share/man/man4 share/mk sys/conf sys/modules/geom tools/build/mk Message-ID: <201412021953.sB2JruVK009430@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Dec 2 19:53:55 2014 New Revision: 275421 URL: https://svnweb.freebsd.org/changeset/base/275421 Log: Make ccd(4), et al conditional based on MK_CCD Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/sbin/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/sys/conf/kern.opts.mk projects/building-blocks/sys/modules/geom/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -20,7 +20,6 @@ FILES= DAEMON \ ${_bsnmpd} \ ${_bthidd} \ ${_casperd} \ - ccd \ cleanvar \ cleartmp \ cron \ @@ -167,6 +166,10 @@ _bsnmpd= bsnmpd _casperd= casperd .endif +.if ${MK_CCD} != "no" +FILES+= ccd +.endif + .if ${MK_FTP} != "no" FILES+= ftpd .endif @@ -226,10 +229,6 @@ FILES+= lpd FILES+= ugidfw .endif -.if ${MK_NS_CACHING} != "no" -_nscd= nscd -.endif - .if ${MK_KERBEROS} != "no" FILES+= ipropd_master FILES+= ipropd_slave @@ -260,6 +259,10 @@ FILES+= ypupdated FILES+= ypxfrd .endif +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif + .if ${MK_NTP} != "no" FILES+= ntpd FILES+= ntpdate Modified: projects/building-blocks/sbin/Makefile ============================================================================== --- projects/building-blocks/sbin/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sbin/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -8,7 +8,6 @@ SUBDIR=adjkerntz \ badsect \ camcontrol \ - ccdconfig \ clri \ comcontrol \ conscontrol \ @@ -78,6 +77,10 @@ SUBDIR+= atm SUBDIR+= casperd .endif +.if ${MK_CCD} != "no" +SUBDIR+= ccdconfig +.endif + .if ${MK_CXX} != "no" SUBDIR+= devd .endif Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/share/man/man4/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -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 \ @@ -743,6 +743,10 @@ SUBDIR= man4.${MACHINE_CPUARCH} _bhyve.4= bhyve.4 .endif +.if ${MK_CCD} != "no" +_ccd.4= ccd.4 +.endif + .if ${MK_ISCSI} != "no" MAN+= iscsi.4 MAN+= iscsi_initiator.4 Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 19:53:55 2014 (r275421) @@ -67,6 +67,7 @@ __DEFAULT_YES_OPTIONS = \ CALENDAR \ CAPSICUM \ CASPER \ + CCD \ CDDL \ CPP \ CROSS_COMPILER \ Modified: projects/building-blocks/sys/conf/kern.opts.mk ============================================================================== --- projects/building-blocks/sys/conf/kern.opts.mk Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sys/conf/kern.opts.mk Tue Dec 2 19:53:55 2014 (r275421) @@ -25,6 +25,7 @@ __DEFAULT_YES_OPTIONS = \ AUTOFS \ BLUETOOTH \ + CCD \ CDDL \ CRYPT \ FORMAT_EXTENSIONS \ Modified: projects/building-blocks/sys/modules/geom/Makefile ============================================================================== --- projects/building-blocks/sys/modules/geom/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sys/modules/geom/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -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: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:53:55 2014 (r275421) @@ -934,6 +934,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412021953.sB2JruVK009430>