svn commit: r299169 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Fri May  6 09:18:09 2016
New Revision: 299169
URL: https://svnweb.freebsd.org/changeset/base/299169

Log:
  Only install etc/rc.d/{rfcomm_pppd_server,sdpd} if MK_BLUETOOTH != no
  
  These are bluetooth specific services
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Fri May  6 09:00:57 2016	(r299168)
+++ head/etc/rc.d/Makefile	Fri May  6 09:18:09 2016	(r299169)
@@ -98,7 +98,6 @@ FILES=	DAEMON \
 	rarpd \
 	rctl \
 	resolv \
-	rfcomm_pppd_server \
 	root \
 	route6d \
 	routing \
@@ -106,7 +105,6 @@ FILES=	DAEMON \
 	rtadvd \
 	rtsold \
 	savecore \
-	sdpd \
 	securelevel \
 	serial \
 	sppp \
@@ -180,6 +178,8 @@ FILES+=		autounmountd
 _bluetooth=	bluetooth
 _bthidd=	bthidd
 _hcsecd=	hcsecd
+FILES+=		rfcomm_pppd_server
+FILES+=		sdpd
 _ubthidhci=	ubthidhci
 .endif
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 09:00:57 2016	(r299168)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 09:18:09 2016	(r299169)
@@ -410,6 +410,8 @@ OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
 OLD_FILES+=etc/rc.d/hcsecd
+OLD_FILES+=etc/rc.d/rfcomm_pppd_server
+OLD_FILES+=etc/rc.d/sdpd
 OLD_FILES+=etc/rc.d/ubthidhci
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat