Merge the latest tools code in Tizen_2.2 RSA

We do tools Code Sync in tizen_2.2 RSA.

Change-Id: I62242d0d5a19f0fe33885047042b8e2f921ec5b8

diff --git a/packaging/bluetooth-tools.spec b/packaging/bluetooth-tools.spec
index 3924992..655df4e 100644 (file)
--- a/packaging/bluetooth-tools.spec
+++ b/packaging/bluetooth-tools.spec
@@ -9,8 +9,7 @@ Source1001:     bluetooth-address.service
 BuildRequires:  cmake
 
 %description
-Tools fo bluetooth run/stop and set address
-
+Tools fo bluetooth run/stop
 
 %prep
 %setup -q
@@ -28,8 +27,6 @@ rm -rf %{buildroot}
 
 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}%{_libdir}/systemd/system/multi-user.target.wants
 install -m 0644 %{SOURCE1001} %{buildroot}%{_libdir}/systemd/system/
@@ -41,9 +38,6 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 %files
 %manifest bluetooth-tools.manifest
 %defattr(-,root,root,-)
-%{_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-stack-up.sh
 %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-stack-down.sh
 %attr(0755,-,-) %{_prefix}/etc/bluetooth/bt-reset-env.sh

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index a26f569..cfef087 100755 (executable)
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -9,5 +9,3 @@ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-edutm-dev-up.sh DESTINATION etc/
 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 booting script
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-address DESTINATION /etc/rc.d/init.d)

diff --git a/scripts/bt-stack-up.sh b/scripts/bt-stack-up.sh
index 4145556..7780262 100644 (file)
--- a/scripts/bt-stack-up.sh
+++ b/scripts/bt-stack-up.sh
@@ -12,9 +12,6 @@ if !(/usr/sbin/hciconfig | grep hci); then
        exit 1
 fi
 
-# Execute BlueZ BT stack
-echo "Run bluetoothd"
-
 # We have to handle both systemd and sysvinit cases differently
 if [ -d /sys/fs/cgroup/systemd ]; then
    # bt-service changes USER to 'app' via libprivilege-control, so it needs
@@ -26,6 +23,9 @@ else
    /usr/sbin/bluetoothd -d
 fi
 
+# Execute BlueZ BT stack
+echo "Run bluetoothd"
+/usr/sbin/bluetoothd -d
 /usr/bin/bt-service &
 /usr/bin/bluetooth-share &