d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make nfs server components conditional according to MK_NFS_SERVER

Browse Source
This commit is contained in:
Enji Cooper 2014-11-30 02:31:37 +00:00
parent 04267db69b
commit e7d836f78d
8 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/rc.d/Makefile
View File

@ -74,9 +74,6 @@ FILES= DAEMON \
netwait \
newsyslog \
nfsclient \
nfscbd \
nfsd \
nfsuserd \
nisdomain \
${_nscd} \
nsswitch \
@ -235,6 +232,12 @@ _kpasswdd= kpasswdd
_othermta= othermta
.endif
.if ${MK_NFS_SERVER} != "no"
FILES+= nfscbd
FILES+= nfsd
FILES+= nfsuserd
.endif
.if ${MK_NTP} != "no"
FILES+= ntpd
FILES+= ntpdate

6
include/Makefile
View File

@ -37,7 +37,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \
syslog.h ucontext.h
LDIRS= cam geom net net80211 netinet netinet6 \
netipsec netsmb nfs nfsclient nfsserver sys vm
netipsec netsmb nfs nfsclient sys vm
LSUBDIRS= cam/ata cam/scsi \
dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
@ -79,6 +79,10 @@ LDIRS+= netgraph
LSUBDIRS+= netgraph/netflow
.endif
.if ${MK_NFS_SERVER} != "no"
LDIRS+= nfsserver
.endif
.if ${MK_USB} != "no"
LSUBDIRS+= dev/usb
.endif

1
share/mk/src.opts.mk
View File

@ -128,6 +128,7 @@ __DEFAULT_YES_OPTIONS = \
NETCAT \
NETGRAPH \
NETGRAPH_SUPPORT \
NFS_SERVER \
NLS_CATALOGS \
NS_CACHING \
NTP \

1
sys/conf/kern.opts.mk
View File

@ -34,6 +34,7 @@ __DEFAULT_YES_OPTIONS = \
IPFILTER \
KERNEL_SYMBOLS \
NETGRAPH \
NFS_SERVER \
PF \
SOURCELESS_HOST \
SOURCELESS_UCODE \

7
sys/modules/Makefile
View File

@ -251,10 +251,8 @@ SUBDIR= \
nfscl \
nfsclient \
nfscommon \
nfsd \
nfslock \
nfslockd \
nfsserver \
nfssvc \
nge \
nmdm \
@ -441,6 +439,11 @@ _nandsim= nandsim
_netgraph= netgraph
.endif
.if ${MK_NFS_SERVER} != "no" || defined(ALL_MODULES)
SUBDIR+= nfsd
SUBDIR+= nfsserver
.endif
.if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
_pf= pf

18
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -4083,6 +4083,24 @@ OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
OLD_FILES+=usr/share/misc/windrv_stub.c
.endif
.if ${MK_NFS_SERVER} == no
OLD_FILES+=etc/rc.d/nfscbd
OLD_FILES+=etc/rc.d/nfsd
OLD_FILES+=etc/rc.d/nfsuserd
OLD_FILES+=usr/sbin/nfscbd
OLD_FILES+=usr/sbin/nfsd
OLD_FILES+=usr/sbin/nfsdumpstate
OLD_FILES+=usr/sbin/nfsrevoke
OLD_FILES+=usr/sbin/nfsuserd
OLD_FILES+=usr/share/man/man4/nfsv4.4.gz
OLD_FILES+=usr/share/man/man5/stablerestart.5.gz
OLD_FILES+=usr/share/man/man8/nfscbd.8.gz
OLD_FILES+=usr/share/man/man8/nfsd.8.gz
OLD_FILES+=usr/share/man/man8/nfsdumpstate.8.gz
OLD_FILES+=usr/share/man/man8/nfsrevoke.8.gz
OLD_FILES+=usr/share/man/man8/nfsuserd.8.gz
.endif
.if ${MK_NETCAT} == no
OLD_FILES+=usr/bin/nc
OLD_FILES+=usr/share/man/man1/nc.1.gz

6
tools/build/options/WITHOUT_NFS_SERVER Normal file
View File

@ -0,0 +1,6 @@
.\" $FreeBSD$
Set to not build or install
.Xr nfsd 8 ,
.Xr nfsdumpstate 8 ,
.Xr nfsuserd 8 ,
and associated programs.

19
usr.sbin/Makefile
View File

@ -45,17 +45,11 @@ SUBDIR= adduser \
mtest \
${_mtree} \
newsyslog \
nfscbd \
nfsd \
nfsdumpstate \
nfsrevoke \
nfsuserd \
nmtree \
nologin \
${_pc_sysinstall} \
pciconf \
periodic \
powerd \
procctl \
pstat \
pw \
@ -96,6 +90,11 @@ SUBDIR+= accton
SUBDIR+= sa
.endif
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
SUBDIR+= powerd
SUBDIR+= zzz
.endif
.if ${MK_AMD} != "no"
SUBDIR+= amd
.endif
@ -234,6 +233,14 @@ SUBDIR+= ngctl
SUBDIR+= nghook
.endif
.if ${MK_NFS_SERVER} != "no"
SUBDIR+= nfscbd
SUBDIR+= nfsd
SUBDIR+= nfsdumpstate
SUBDIR+= nfsrevoke
SUBDIR+= nfsuserd
.endif
.if ${MK_NIS} != "no"
SUBDIR+= rpc.yppasswdd
SUBDIR+= rpc.ypupdated