From: Wootak Jung Date: Fri, 12 Apr 2019 05:15:20 +0000 (+0900) Subject: Exclude hci logger and dump files X-Git-Tag: accepted/tizen/unified/20190416.071439^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fbluetooth-tools.git;a=commitdiff_plain;h=e56a72903f64c494a2119f3c5091ae6b07a476c4 Exclude hci logger and dump files Change-Id: I0b4676bc3fd7c9513c9f328c14343ade7da525ad --- diff --git a/packaging/bluetooth-tools.spec b/packaging/bluetooth-tools.spec index 37deca8..9e7b09f 100644 --- a/packaging/bluetooth-tools.spec +++ b/packaging/bluetooth-tools.spec @@ -91,11 +91,11 @@ mkdir -p %{buildroot}/run/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 -install -D -m 0644 packaging/bluetooth-hci-logger.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger.service -install -D -m 0644 packaging/bluetooth-hci-logger.path %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger.path +#install -D -m 0644 packaging/bluetooth-hci-logger.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger.service +#install -D -m 0644 packaging/bluetooth-hci-logger.path %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger.path -install -D -m 0644 packaging/bluetooth-hci-logger-stop.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger-stop.service -install -D -m 0644 packaging/bluetooth-hci-logger-stop.path %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger-stop.path +#install -D -m 0644 packaging/bluetooth-hci-logger-stop.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger-stop.service +#install -D -m 0644 packaging/bluetooth-hci-logger-stop.path %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-logger-stop.path install -D -m 0644 packaging/bluez-start.service %{buildroot}%{_libdir}/systemd/system/bluez-start.service install -D -m 0644 packaging/bluez-start.path %{buildroot}%{_libdir}/systemd/system/bluez-start.path @@ -109,8 +109,8 @@ install -D -m 0644 packaging/bluetooth-stack-down.path %{buildroot}%{_libdir}/sy install -D -m 0644 packaging/bluetooth-stack-down-with-radio.service %{buildroot}%{_libdir}/systemd/system/bluetooth-stack-down-with-radio.service install -D -m 0644 packaging/bluetooth-stack-down-with-radio.path %{buildroot}%{_libdir}/systemd/system/bluetooth-stack-down-with-radio.path -install -D -m 0644 packaging/bluetooth-force-hci-logger.service %{buildroot}%{_libdir}/systemd/system/bluetooth-force-hci-logger.service -install -D -m 0644 packaging/bluetooth-hci-dump@.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-dump@.service +#install -D -m 0644 packaging/bluetooth-force-hci-logger.service %{buildroot}%{_libdir}/systemd/system/bluetooth-force-hci-logger.service +#install -D -m 0644 packaging/bluetooth-hci-dump@.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-dump@.service install -D -m 0644 packaging/bluetooth-hci-up.service %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-up.service install -D -m 0644 packaging/bluetooth-hci-up.path %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-up.path @@ -120,13 +120,13 @@ install -D -m 0644 packaging/bluetooth-hci-down.path %{buildroot}%{_libdir}/syst %post mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ mkdir -p %{_libdir}/systemd/system/multi-user.target.wants/ -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-hci-logger.path -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-hci-logger.path +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-hci-logger-stop.path -ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-hci-logger-stop.path +#ln -sf %{_libdir}/systemd/system/bluetooth-hci-logger-stop.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ ln -sf %{_libdir}/systemd/system/bluez-start.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ ln -sf %{_libdir}/systemd/system/bluez-start.path %{_libdir}/systemd/system/multi-user.target.wants/bluez-start.path @@ -140,7 +140,7 @@ ln -sf %{_libdir}/systemd/system/bluetooth-stack-down.service %{_sysconfdir}/sys ln -sf %{_libdir}/systemd/system/bluetooth-stack-down.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-stack-down.path ln -sf %{_libdir}/systemd/system/bluetooth-stack-down.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ -ln -sf %{_libdir}/systemd/system/bluetooth-force-hci-logger.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ +#ln -sf %{_libdir}/systemd/system/bluetooth-force-hci-logger.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ ln -sf %{_libdir}/systemd/system/bluetooth-hci-up.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ ln -sf %{_libdir}/systemd/system/bluetooth-hci-up.path %{_libdir}/systemd/system/multi-user.target.wants/bluetooth-hci-up.path ln -sf %{_libdir}/systemd/system/bluetooth-hci-up.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ @@ -160,18 +160,18 @@ ln -sf %{_libdir}/systemd/system/bluetooth-hci-down.path %{_sysconfdir}/systemd/ %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 +#%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 -%{_libdir}/systemd/system/bluetooth-hci-logger.service -%{_libdir}/systemd/system/bluetooth-hci-logger.path -%{_libdir}/systemd/system/bluetooth-hci-logger-stop.service -%{_libdir}/systemd/system/bluetooth-hci-logger-stop.path +#%{_libdir}/systemd/system/bluetooth-hci-logger.service +#%{_libdir}/systemd/system/bluetooth-hci-logger.path +#%{_libdir}/systemd/system/bluetooth-hci-logger-stop.service +#%{_libdir}/systemd/system/bluetooth-hci-logger-stop.path %{_libdir}/systemd/system/bluez-start.service %{_libdir}/systemd/system/bluez-start.path -%{_libdir}/systemd/system/bluetooth-force-hci-logger.service -%{_libdir}/systemd/system/bluetooth-hci-dump@.service +#%{_libdir}/systemd/system/bluetooth-force-hci-logger.service +#%{_libdir}/systemd/system/bluetooth-hci-dump@.service %{_libdir}/systemd/system/bluetooth-stack-up.service %{_libdir}/systemd/system/bluetooth-stack-up.path %{_libdir}/systemd/system/bluetooth-stack-down.service diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index faf43e1..a898ba3 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -25,11 +25,11 @@ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/etc/bt-stack-up.sh DESTINATION etc/ 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) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bt-run-hci-logger.sh.in ${CMAKE_CURRENT_BINARY_DIR}/bt-run-hci-logger.sh @ONLY) +#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bt-run-hci-logger.sh.in ${CMAKE_CURRENT_BINARY_DIR}/bt-run-hci-logger.sh @ONLY) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-edutm-on.sh DESTINATION etc/bluetooth) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-edutm-dev-up.sh DESTINATION etc/bluetooth) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-edutm-mode-on.sh DESTINATION etc/bluetooth) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-edutm-off.sh DESTINATION etc/bluetooth) -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-hci-logdump.sh DESTINATION etc/bluetooth) -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-run-hci-logger.sh DESTINATION etc/bluetooth) +#INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-hci-logdump.sh DESTINATION etc/bluetooth) +#INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-run-hci-logger.sh DESTINATION etc/bluetooth)