svn commit: r275182 - in projects/building-blocks: etc etc/rc.d share share/man/man5 share/mk tools/build/options usr.sbin

[Garrett Cooper]

Author: ngie
Date: Thu Nov 27 09:42:40 2014
New Revision: 275182
URL: https://svnweb.freebsd.org/changeset/base/275182

Log:
  Add WITHOUT_AUTOFS and WITHOUT_BSDCONFIG

Added:
  projects/building-blocks/tools/build/options/WITHOUT_AUTOFS   (contents, props changed)
  projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG   (contents, props changed)
Modified:
  projects/building-blocks/etc/Makefile
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/share/Makefile
  projects/building-blocks/share/man/man5/Makefile
  projects/building-blocks/share/mk/src.opts.mk
  projects/building-blocks/usr.sbin/Makefile

Modified: projects/building-blocks/etc/Makefile
==============================================================================
--- projects/building-blocks/etc/Makefile	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/etc/Makefile	Thu Nov 27 09:42:40 2014	(r275182)
@@ -11,8 +11,7 @@ SUBDIR=	sendmail
 SUBDIR+=tests
 .endif
 
-BIN1=	auto_master \
-	crontab \
+BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \
@@ -81,6 +80,10 @@ BIN1+= amd.map
 BIN1+= apmd.conf
 .endif
 
+.if ${MK_AUTOFS} != "no"
+BIN1+= auto_master
+.endif
+
 .if ${MK_BSNMP} != "no"
 BIN1+= snmpd.config
 .endif
@@ -232,7 +235,9 @@ distribution:
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
+.if ${MK_AUTOFS} != "no"
 	${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
+.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/etc/rc.d/Makefile	Thu Nov 27 09:42:40 2014	(r275182)
@@ -17,9 +17,6 @@ FILES=	DAEMON \
 	atm3 \
 	auditd \
 	auditdistd \
-	automount \
-	automountd \
-	autounmountd \
 	bgfsck \
 	${_bluetooth} \
 	bridge \
@@ -162,6 +159,12 @@ FILES+=	apm
 FILES+=	apmd
 .endif
 
+.if ${MK_AUTOFS} != "no"
+FILES+=	automount
+FILES+=	automountd
+FILES+=	autounmountd
+.endif
+
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd

Modified: projects/building-blocks/share/Makefile
==============================================================================
--- projects/building-blocks/share/Makefile	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/share/Makefile	Thu Nov 27 09:42:40 2014	(r275182)
@@ -8,7 +8,7 @@
 SUBDIR=	${_colldef} \
 	${_dict} \
 	${_doc} \
-	dtrace \
+	${_dtrace} \
 	${_examples} \
 	${_i18n} \
 	keys \
@@ -37,6 +37,10 @@ SUBDIR=	${_colldef} \
 _snmp=		snmp
 .endif
 
+.if ${MK_CDDL} != "no"
+_dtrace=	dtrace
+.endif
+
 .if ${MK_DICT} != "no"
 _dict=		dict
 .endif

Modified: projects/building-blocks/share/man/man5/Makefile
==============================================================================
--- projects/building-blocks/share/man/man5/Makefile	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/share/man/man5/Makefile	Thu Nov 27 09:42:40 2014	(r275182)
@@ -7,7 +7,6 @@
 MAN=	acct.5 \
 	ar.5 \
 	a.out.5 \
-	autofs.5 \
 	bluetooth.device.conf.5 \
 	bluetooth.hosts.5 \
 	bluetooth.protocols.5 \
@@ -80,6 +79,10 @@ MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
 
+.if ${MK_AUTOFS} != "no"
+MAN+=	autofs.5
+.endif
+
 .if ${MK_FREEBSD_UPDATE} != "no"
 MAN+=	freebsd-update.conf.5
 .endif

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/share/mk/src.opts.mk	Thu Nov 27 09:42:40 2014	(r275182)
@@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \
     ATM \
     AUDIT \
     AUTHPF \
+    AUTOFS \
     BINUTILS \
     BINUTILS_BOOTSTRAP \
     BLUETOOTH \
@@ -59,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \
     BOOTPD \
     BOOTPARAMD \
     BSD_CPIO \
+    BSDCONFIG \
     BSDINSTALL \
     BSNMP \
     BZIP2 \

Added: projects/building-blocks/tools/build/options/WITHOUT_AUTOFS
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_AUTOFS	Thu Nov 27 09:42:40 2014	(r275182)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr autofs 4
+related programs, libraries, and kernel modules.

Added: projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_BSDCONFIG	Thu Nov 27 09:42:40 2014	(r275182)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build
+.Xr bsdconfig 8 ,
+.Xr sysrc 8 ,
+and related programs.

Modified: projects/building-blocks/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/usr.sbin/Makefile	Thu Nov 27 09:40:36 2014	(r275181)
+++ projects/building-blocks/usr.sbin/Makefile	Thu Nov 27 09:42:40 2014	(r275182)
@@ -5,9 +5,7 @@
 
 SUBDIR=	adduser \
 	arp \
-	autofs \
 	binmiscctl \
-	bsdconfig \
 	cdcontrol \
 	chkgrp \
 	chown \
@@ -79,7 +77,6 @@ SUBDIR=	adduser \
 	snapinfo \
 	spray \
 	syslogd \
-	sysrc \
 	tcpdrop \
 	tcpdump \
 	traceroute \
@@ -117,6 +114,10 @@ SUBDIR+=	praudit
 SUBDIR+=	authpf
 .endif
 
+.if ${MK_AUTOFS} != "no"
+SUBDIR+=	autofs
+.endif
+
 .if ${MK_BLUETOOTH} != "no"
 SUBDIR+=	bluetooth
 .endif
@@ -125,6 +126,11 @@ SUBDIR+=	bluetooth
 SUBDIR+=	bootparamd
 .endif
 
+.if ${MK_BSDCONFIG} != "no"
+SUBDIR+=	bsdconfig
+SUBDIR+=	sysrc
+.endif
+
 .if ${MK_BSDINSTALL} != "no"
 SUBDIR+=	bsdinstall
 .endif