svn commit: r335963 - in head: etc share/mk tools/build/mk tools/build/options

[Rodney W. Grimes]

[ Charset UTF-8 unsupported, converting... ]
> Author: sbruno
> Date: Wed Jul  4 17:18:35 2018
> New Revision: 335963
> URL: https://svnweb.freebsd.org/changeset/base/335963
> 
> Log:
>   WITHOUT_SERVICESDB:
>   
>   Add src.conf knob to disable the installation of /var/db/services.db
>   
>   Default to leaving services.db in place, but allow the removal of the
>   file and its creation with a src.conf knob.
>   
>   This file ends up being 2MB in size.  For small systems this is a waste
>   of space but its a tradeoff.

THANK YOU!  I can now remove an ugly local hack :-)


>   
>   Reviewed by:	bdrewery
>   Differential Revision:	https://reviews.freebsd.org/D9655
> 
> Added:
>   head/tools/build/options/WITHOUT_SERVICESDB   (contents, props changed)
> Modified:
>   head/etc/Makefile
>   head/share/mk/src.opts.mk
>   head/tools/build/mk/OptionalObsoleteFiles.inc
> 
> Modified: head/etc/Makefile
> ==============================================================================
> --- head/etc/Makefile	Wed Jul  4 17:10:07 2018	(r335962)
> +++ head/etc/Makefile	Wed Jul  4 17:18:35 2018	(r335963)
> @@ -192,12 +192,17 @@ distribution:
>  	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
>  		${BIN1} ${DESTDIR}/etc; \
>  	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
> -	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
> -		${DESTDIR}/etc/services; \
>  	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
>  		${BIN2} ${DESTDIR}/etc; \
>  	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
>  		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
> +
> +.if ${MK_SERVICESDB} != "no"
> +	cd ${.CURDIR}; \
> +	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
> +		${DESTDIR}/etc/services;
> +.endif
> +
>  .if ${MK_BSNMP} != "no"
>  	cd ${.CURDIR}; \
>  	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
> 
> Modified: head/share/mk/src.opts.mk
> ==============================================================================
> --- head/share/mk/src.opts.mk	Wed Jul  4 17:10:07 2018	(r335962)
> +++ head/share/mk/src.opts.mk	Wed Jul  4 17:18:35 2018	(r335963)
> @@ -160,6 +160,7 @@ __DEFAULT_YES_OPTIONS = \
>      RESCUE \
>      ROUTED \
>      SENDMAIL \
> +    SERVICESDB \
>      SETUID_LOGIN \
>      SHAREDOCS \
>      SOURCELESS \
> 
> Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
> ==============================================================================
> --- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul  4 17:10:07 2018	(r335962)
> +++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul  4 17:18:35 2018	(r335963)
> @@ -7527,6 +7527,10 @@ OLD_DIRS+=usr/share/sendmail/cf
>  OLD_DIRS+=usr/share/sendmail
>  .endif
>  
> +.if ${MK_SERVICESDB} == no
> +OLD_FILES+=var/db/services.db
> +.endif
> +
>  .if ${MK_SHAREDOCS} == no
>  OLD_FILES+=usr/share/doc/pjdfstest/README
>  OLD_DIRS+=usr/share/doc/pjdfstest
> 
> Added: head/tools/build/options/WITHOUT_SERVICESDB
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/tools/build/options/WITHOUT_SERVICESDB	Wed Jul  4 17:18:35 2018	(r335963)
> @@ -0,0 +1,3 @@
> +.\" $FreeBSD$
> +Set to not install
> +.Pa /var/db/services.db .
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org