From ca15f0c3be5a79ebaae1ce99f1fc5e497d86933e Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Wed, 6 Sep 2017 09:57:18 +0900 Subject: [PATCH] Remove the booting script to set BT address Change-Id: I16d47185dcb173415f6439ed5f788194975e4152 Signed-off-by: DoHyun Pyun --- packaging/bluetooth-tools.spec | 23 +++++++---------------- scripts/CMakeLists.txt | 5 ----- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/packaging/bluetooth-tools.spec b/packaging/bluetooth-tools.spec index 069e354..8b0e761 100644 --- a/packaging/bluetooth-tools.spec +++ b/packaging/bluetooth-tools.spec @@ -5,7 +5,7 @@ Release: 0 Group: Network & Connectivity/Bluetooth License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: bluetooth-address.service +#Source1001: bluetooth-address.service BuildRequires: cmake Suggests: bluetooth-share Requires: tizen-platform-config-tools @@ -86,15 +86,6 @@ export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols= rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d -ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-address %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S60bluetooth-address -ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-address %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S60bluetooth-address - -mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants -install -m 0644 %{SOURCE1001} %{buildroot}%{_unitdir} -ln -s ../bluetooth-address.service %{buildroot}%{_unitdir}/multi-user.target.wants/bluetooth-address.service - mkdir -p %{buildroot}%{_prefix}/etc/bluetooth/ install -m 0755 scripts/bt-dev-start.sh %{buildroot}%{_prefix}/etc/bluetooth/bt-dev-start.sh install -m 0755 scripts/bt-dev-end.sh %{buildroot}%{_prefix}/etc/bluetooth/bt-dev-end.sh @@ -113,17 +104,17 @@ ln -sf %{_libdir}/systemd/system/bluetooth-force-hci-logger.service %{_sysconfdi %manifest %{name}.manifest %license LICENSE.APLv2 %defattr(-,root,root,-) -%exclude %{_sysconfdir}/rc.d/init.d/bluetooth-address -%{_sysconfdir}/rc.d/rc3.d/S60bluetooth-address -%{_sysconfdir}/rc.d/rc5.d/S60bluetooth-address +#%exclude %{_sysconfdir}/rc.d/init.d/bluetooth-address +#%{_sysconfdir}/rc.d/rc3.d/S60bluetooth-address +#%{_sysconfdir}/rc.d/rc5.d/S60bluetooth-address %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-edutm-on.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-edutm-dev-up.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-edutm-mode-on.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-edutm-off.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-hci-logdump.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-run-hci-logger.sh -%{_unitdir}/multi-user.target.wants/bluetooth-address.service -%{_unitdir}/bluetooth-address.service +#%{_unitdir}/multi-user.target.wants/bluetooth-address.service +#%{_unitdir}/bluetooth-address.service %{_libdir}/systemd/system/bluetooth-hci-logger.service %{_libdir}/systemd/system/bluetooth-force-hci-logger.service %{_libdir}/systemd/system/bluetooth-hci-dump@.service @@ -142,7 +133,7 @@ rm bt-reset-env.sh popd %files profile_common %license LICENSE.APLv2 -%{_sysconfdir}/rc.d/init.d/bluetooth-address +#%{_sysconfdir}/rc.d/init.d/bluetooth-address %attr(0755,-,-) %{_prefix}/etc/bluetooth/common/bt-stack-up.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/common/bt-stack-down.sh %attr(0755,-,-) %{_prefix}/etc/bluetooth/common/bt-reset-env.sh diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 616753c..faf43e1 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -24,11 +24,6 @@ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/ivi/bt-reset-env.sh DESTINATION etc INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/etc/bt-stack-up.sh DESTINATION etc/bluetooth/common) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/etc/bt-stack-down.sh DESTINATION etc/bluetooth/common) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/etc/bt-reset-env.sh DESTINATION etc/bluetooth/common) -# install booting script -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/etc/bluetooth-address DESTINATION /etc/rc.d/init.d) - - -# For All CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bt-run-hci-logger.sh.in ${CMAKE_CURRENT_BINARY_DIR}/bt-run-hci-logger.sh @ONLY) -- 2.7.4