From owner-svn-src-all@freebsd.org Wed Jul 4 17:18:37 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0F211025CE2; Wed, 4 Jul 2018 17:18:36 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 946D58860D; Wed, 4 Jul 2018 17:18:36 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75A5261A1; Wed, 4 Jul 2018 17:18:36 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w64HIaKh022781; Wed, 4 Jul 2018 17:18:36 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64HIZOg022778; Wed, 4 Jul 2018 17:18:35 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201807041718.w64HIZOg022778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Wed, 4 Jul 2018 17:18:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335963 - in head: etc share/mk tools/build/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: in head: etc share/mk tools/build/mk tools/build/options X-SVN-Commit-Revision: 335963 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2018 17:18:37 -0000 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. 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 .