Date: Mon, 26 Jan 2015 07:15:49 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277728 - in head: etc etc/rc.d share/man/man5 share/mk sys/conf sys/modules tools/build/mk tools/build/options usr.sbin Message-ID: <201501260715.t0Q7FnDB073226@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Jan 26 07:15:49 2015 New Revision: 277728 URL: https://svnweb.freebsd.org/changeset/base/277728 Log: Add MK_AUTOFS knob for building and installing autofs(4), et al MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Added: head/tools/build/options/WITHOUT_AUTOFS (contents, props changed) Modified: head/etc/Makefile head/etc/rc.d/Makefile head/share/man/man5/Makefile head/share/mk/src.opts.mk head/sys/conf/kern.opts.mk head/sys/modules/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Mon Jan 26 06:44:48 2015 (r277727) +++ head/etc/Makefile Mon Jan 26 07:15:49 2015 (r277728) @@ -14,8 +14,7 @@ SUBDIR+=sendmail SUBDIR+=tests .endif -BIN1= auto_master \ - crontab \ +BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ @@ -90,6 +89,10 @@ BIN1+= amd.map BIN1+= apmd.conf .endif +.if ${MK_AUTOFS} != "no" +BIN1+= auto_master +.endif + .if ${MK_BSNMP} != "no" BIN1+= snmpd.config .endif @@ -229,7 +232,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: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Mon Jan 26 06:44:48 2015 (r277727) +++ head/etc/rc.d/Makefile Mon Jan 26 07:15:49 2015 (r277728) @@ -20,9 +20,6 @@ FILES= DAEMON \ atm3 \ auditd \ auditdistd \ - automount \ - automountd \ - autounmountd \ bgfsck \ ${_bluetooth} \ bootparams \ @@ -158,6 +155,12 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_AUTOFS} != "no" +FILES+= automount +FILES+= automountd +FILES+= autounmountd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd Modified: head/share/man/man5/Makefile ============================================================================== --- head/share/man/man5/Makefile Mon Jan 26 06:44:48 2015 (r277727) +++ head/share/man/man5/Makefile Mon Jan 26 07:15:49 2015 (r277728) @@ -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: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Mon Jan 26 06:44:48 2015 (r277727) +++ head/share/mk/src.opts.mk Mon Jan 26 07:15:49 2015 (r277728) @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + AUTOFS \ BHYVE \ BINUTILS \ BINUTILS_BOOTSTRAP \ Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Mon Jan 26 06:44:48 2015 (r277727) +++ head/sys/conf/kern.opts.mk Mon Jan 26 07:15:49 2015 (r277728) @@ -23,6 +23,7 @@ # src tree. __DEFAULT_YES_OPTIONS = \ + AUTOFS \ BHYVE \ BLUETOOTH \ CCD \ Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Jan 26 06:44:48 2015 (r277727) +++ head/sys/modules/Makefile Mon Jan 26 07:15:49 2015 (r277728) @@ -47,7 +47,7 @@ SUBDIR= \ ata \ ath \ ath_pci \ - autofs \ + ${_autofs} \ ${_auxio} \ ${_bce} \ bfe \ @@ -382,6 +382,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) +_autofs= autofs +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 06:44:48 2015 (r277727) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 07:15:49 2015 (r277728) @@ -144,6 +144,26 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_AUTOFS} == no +OLD_FILES+=etc/autofs/include_ldap +OLD_FILES+=etc/autofs/special_hosts +OLD_FILES+=etc/autofs/special_media +OLD_FILES+=etc/autofs/special_null +OLD_FILES+=etc/auto_master +OLD_FILES+=etc/rc.d/automount +OLD_FILES+=etc/rc.d/automountd +OLD_FILES+=etc/rc.d/autounmountd +OLD_FILES+=usr/sbin/automount +OLD_FILES+=usr/sbin/automountd +OLD_FILES+=usr/sbin/autounmountd +OLD_FILES+=usr/share/man/man5/autofs.5.gz +OLD_FILES+=usr/share/man/man5/auto_master.5.gz +OLD_FILES+=usr/share/man/man8/automount.8.gz +OLD_FILES+=usr/share/man/man8/automountd.8.gz +OLD_FILES+=usr/share/man/man8/autounmountd.8.gz +OLD_DIRS+=etc/autofs +.endif + .if ${MK_BHYVE} == no OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl Added: head/tools/build/options/WITHOUT_AUTOFS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_AUTOFS Mon Jan 26 07:15:49 2015 (r277728) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr autofs 4 +related programs, libraries, and kernel modules. Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Mon Jan 26 06:44:48 2015 (r277727) +++ head/usr.sbin/Makefile Mon Jan 26 07:15:49 2015 (r277728) @@ -5,7 +5,6 @@ SUBDIR= adduser \ arp \ - autofs \ binmiscctl \ bootparamd \ bsdconfig \ @@ -124,6 +123,10 @@ SUBDIR+= praudit SUBDIR+= authpf .endif +.if ${MK_AUTOFS} != "no" +SUBDIR+= autofs +.endif + .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501260715.t0Q7FnDB073226>