svn commit: r275295 - in projects/building-blocks: etc/rc.d include share/mk sys/conf sys/modules tools/build/mk tools/build/options usr.sbin

Garrett Cooper ngie at FreeBSD.org
Sun Nov 30 02:31:40 UTC 2014 

Author: ngie
Date: Sun Nov 30 02:31:37 2014
New Revision: 275295
URL: https://svnweb.freebsd.org/changeset/base/275295

Log:
  Make nfs server components conditional according to MK_NFS_SERVER

Added:
  projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER   (contents, props changed)
Modified:
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/include/Makefile
  projects/building-blocks/share/mk/src.opts.mk
  projects/building-blocks/sys/conf/kern.opts.mk
  projects/building-blocks/sys/modules/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/usr.sbin/Makefile

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/etc/rc.d/Makefile	Sun Nov 30 02:31:37 2014	(r275295)
@@ -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

Modified: projects/building-blocks/include/Makefile
==============================================================================
--- projects/building-blocks/include/Makefile	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/include/Makefile	Sun Nov 30 02:31:37 2014	(r275295)
@@ -37,7 +37,7 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.
 	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

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/share/mk/src.opts.mk	Sun Nov 30 02:31:37 2014	(r275295)
@@ -128,6 +128,7 @@ __DEFAULT_YES_OPTIONS = \
     NETCAT \
     NETGRAPH \
     NETGRAPH_SUPPORT \
+    NFS_SERVER \
     NLS_CATALOGS \
     NS_CACHING \
     NTP \

Modified: projects/building-blocks/sys/conf/kern.opts.mk
==============================================================================
--- projects/building-blocks/sys/conf/kern.opts.mk	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/sys/conf/kern.opts.mk	Sun Nov 30 02:31:37 2014	(r275295)
@@ -34,6 +34,7 @@ __DEFAULT_YES_OPTIONS = \
     IPFILTER \
     KERNEL_SYMBOLS \
     NETGRAPH \
+    NFS_SERVER \
     PF \
     SOURCELESS_HOST \
     SOURCELESS_UCODE \

Modified: projects/building-blocks/sys/modules/Makefile
==============================================================================
--- projects/building-blocks/sys/modules/Makefile	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/sys/modules/Makefile	Sun Nov 30 02:31:37 2014	(r275295)
@@ -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

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 02:31:37 2014	(r275295)
@@ -4083,6 +4083,24 @@ OLD_FILES+=usr/share/man/man8/ndisgen.8.
 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

Added: projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER	Sun Nov 30 02:31:37 2014	(r275295)
@@ -0,0 +1,6 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr nfsd 8 ,
+.Xr nfsdumpstate 8 ,
+.Xr nfsuserd 8 ,
+and associated programs.

Modified: projects/building-blocks/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/usr.sbin/Makefile	Sun Nov 30 02:27:37 2014	(r275294)
+++ projects/building-blocks/usr.sbin/Makefile	Sun Nov 30 02:31:37 2014	(r275295)
@@ -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

More information about the svn-src-projects mailing list