Author: ngie
Date: Wed Feb 11 07:30:20 2015
New Revision: 278558
URL: https://svnweb.freebsd.org/changeset/base/278558
Log:
MFC r277728:
r277728:
Add MK_AUTOFS knob for building and installing autofs(4), et al
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/tools/build/options/WITHOUT_AUTOFS
- copied unchanged from r277728, head/tools/build/options/WITHOUT_AUTOFS
Modified:
stable/10/etc/Makefile
stable/10/etc/rc.d/Makefile
stable/10/share/man/man5/Makefile
stable/10/share/mk/bsd.own.mk
stable/10/sys/modules/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
stable/10/usr.sbin/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile Wed Feb 11 07:21:16 2015 (r278557)
+++ stable/10/etc/Makefile Wed Feb 11 07:30:20 2015 (r278558)
@@ -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: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Wed Feb 11 07:21:16 2015 (r278557)
+++ stable/10/etc/rc.d/Makefile Wed Feb 11 07:30:20 2015 (r278558)
@@ -17,9 +17,6 @@ FILES= DAEMON \
atm3 \
auditd \
auditdistd \
- automount \
- automountd \
- autounmountd \
bgfsck \
${_bluetooth} \
bootparams \
@@ -170,6 +167,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: stable/10/share/man/man5/Makefile
==============================================================================
--- stable/10/share/man/man5/Makefile Wed Feb 11 07:21:16 2015
(r278557)
+++ stable/10/share/man/man5/Makefile Wed Feb 11 07:30:20 2015
(r278558)
@@ -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: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Wed Feb 11 07:21:16 2015
(r278557)
+++ stable/10/share/mk/bsd.own.mk Wed Feb 11 07:30:20 2015
(r278558)
@@ -254,6 +254,7 @@ __DEFAULT_YES_OPTIONS = \
ATM \
AUDIT \
AUTHPF \
+ AUTOFS \
BHYVE \
BINUTILS \
BLUETOOTH \
Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile Wed Feb 11 07:21:16 2015
(r278557)
+++ stable/10/sys/modules/Makefile Wed Feb 11 07:30:20 2015
(r278558)
@@ -44,7 +44,7 @@ SUBDIR= \
ata \
ath \
ath_pci \
- autofs \
+ ${_autofs} \
${_auxio} \
${_bce} \
bfe \
@@ -404,6 +404,10 @@ _cxgb= cxgb
_cxgbe= cxgbe
.endif
+.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
+_autofs= autofs
+.endif
+
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:21:16
2015 (r278557)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:30:20
2015 (r278558)
@@ -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
Copied: stable/10/tools/build/options/WITHOUT_AUTOFS (from r277728,
head/tools/build/options/WITHOUT_AUTOFS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_AUTOFS Wed Feb 11 07:30:20
2015 (r278558, copy of r277728, head/tools/build/options/WITHOUT_AUTOFS)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr autofs 4
+related programs, libraries, and kernel modules.
Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile Wed Feb 11 07:21:16 2015 (r278557)
+++ stable/10/usr.sbin/Makefile Wed Feb 11 07:30:20 2015 (r278558)
@@ -5,7 +5,6 @@
SUBDIR= adduser \
arp \
- autofs \
binmiscctl \
bootparamd \
bsdconfig \
@@ -125,6 +124,10 @@ SUBDIR+= praudit
SUBDIR+= authpf
.endif
+.if ${MK_AUTOFS} != "no"
+SUBDIR+= autofs
+.endif
+
.if ${MK_BLUETOOTH} != "no"
SUBDIR+= bluetooth
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
