From 9941801f1eb40a66b2698d8dbfd5cfb7e6a64ad3 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 6 May 2016 09:18:09 +0000 Subject: [PATCH] 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 --- etc/rc.d/Makefile | 4 ++-- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index c34fd46ff39..f7ea98f1f15 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index fb9996f427a..85737fd6762 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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