Date: Thu, 5 Feb 2015 10:06:45 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278243 - in stable/9: etc/defaults tools/build/mk Message-ID: <201502051006.t15A6jp0028094@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 5 10:06:44 2015 New Revision: 278243 URL: https://svnweb.freebsd.org/changeset/base/278243 Log: MFC r277738: r277738: Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf Sponsored by: EMC / Isilon Storage Division Modified: stable/9/etc/defaults/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/etc/defaults/Makefile ============================================================================== --- stable/9/etc/defaults/Makefile Thu Feb 5 09:59:18 2015 (r278242) +++ stable/9/etc/defaults/Makefile Thu Feb 5 10:06:44 2015 (r278243) @@ -1,7 +1,13 @@ # $FreeBSD$ -FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf +.include <bsd.own.mk> + +FILES= devfs.rules periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults +.if ${MK_BLUETOOTH} != "no" +FILES+= bluetooth.device.conf +.endif + .include <bsd.prog.mk> Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 09:59:18 2015 (r278242) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 10:06:44 2015 (r278243) @@ -344,6 +344,8 @@ OLD_DIRS+=var/named/etc/namedb/dynamic OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts OLD_FILES+=etc/bluetooth/protocols +OLD_DIRS+=etc/bluetooth +OLD_FILES+=etc/defaults/bluetooth.device.conf OLD_FILES+=usr/bin/bthost OLD_FILES+=usr/bin/btsockstat OLD_FILES+=usr/bin/rfcomm_sppd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502051006.t15A6jp0028094>