diff options
| author | Jacek Pielaszkiewicz <j.pielaszkie@samsung.com> | 2013-06-25 13:11:03 +0200 |
|---|---|---|
| committer | Łukasz Stelmach <l.stelmach@samsung.com> | 2013-10-29 17:49:57 +0100 |
| commit | 7fbc4c8c6f938a342347095aa13624c844ca614c (patch) | |
| tree | 895c6fb3374ab09540127b51c715ad5a7d74958d | |
| parent | af5addd65413d857521ee1595c76940e8fa5a0cb (diff) | |
| download | sensor-framework-7fbc4c8c6f938a342347095aa13624c844ca614c.tar.gz sensor-framework-7fbc4c8c6f938a342347095aa13624c844ca614c.tar.bz2 sensor-framework-7fbc4c8c6f938a342347095aa13624c844ca614c.zip | |
Conflicts:
sensor-framework.manifest
Change-Id: I5e0af0799fa74e671dd71177320b7d666484e806
Signed-off-by: Jacek Pielaszkiewicz <j.pielaszkie@samsung.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/sensor-framework.spec | 9 | ||||
| -rwxr-xr-x | sfsvc | 15 |
3 files changed, 0 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3db477c..bcb22a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,8 +71,6 @@ if("${PLATFORM_ARCH}" MATCHES "arch_sdk") DESTINATION etc) endif() -install(PROGRAMS sfsvc DESTINATION /etc/rc.d/init.d) - ####################### systemd files installation ############################ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/sensor-framework.service diff --git a/packaging/sensor-framework.spec b/packaging/sensor-framework.spec index edb2c4f..4e9787d 100644 --- a/packaging/sensor-framework.spec +++ b/packaging/sensor-framework.spec @@ -54,12 +54,6 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants ln -s ../sensor-framework.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/sensor-framework.service ln -s ../sensor-framework.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/sensor-framework.socket -# FIXME: remove initscripts after we start using systemd -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d -ln -s ../init.d/sfsvc %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S40sfsvc -ln -s ../init.d/sfsvc %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S40sfsvc - %post vconftool set -t int memory/private/sensor/10001 0 -i vconftool set -t int memory/private/sensor/10002 0 -i @@ -92,9 +86,6 @@ systemctl daemon-reload %files %manifest sensor-framework.manifest -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/sfsvc -%{_sysconfdir}/rc.d/rc3.d/S40sfsvc -%{_sysconfdir}/rc.d/rc4.d/S40sfsvc %{_bindir}/sf_server %attr(0644,root,root)/usr/etc/sf_data_stream.conf %attr(0644,root,root)/usr/etc/sf_filter.conf @@ -1,15 +0,0 @@ -#!/bin/sh - -echo "[rc3.d] sf-svc RC3 script" - -if [ -x /usr/bin/sf_server ]; then - /usr/bin/sf_server -s /usr/etc/sf_sensor.conf -f /usr/etc/sf_filter.conf -p /usr/etc/sf_processor.conf -d /usr/etc/sf_data_stream.conf & -fi - -if [ -f /opt/etc/.hib_capturing ]; then -#add waitting for widget-screen, request from booting-TF (for Normal Boot) ) - echo "Fast boot" - else - echo "waitting for widget-screen about 17s" -fi - |