Commit f2cb5f33 authored by lpotter's avatar lpotter

Rename sensord daemon to sensorfwd

parent 99b55814
......@@ -5,7 +5,7 @@
# 2. If not, try to pick the best-match from the boardname
cd /etc/sensorfw/
if [ -x /usr/sbin/sensord ]; then
if [ -x /usr/sbin/sensorfwd ]; then
if [ -f /usr/lib/libhybrissensorfw*.so ]; then
# Always prefer hybris sensor backend to anything else (also overwrite
# old setting, as sometimes the boardname matches, e.g. on grouper)
......
......@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.bz2
# as those are added to packaging dir by tar_git.
Source1: sensord-daemon-conf-setup
Source2: sensorfw-rpmlintrc
Source3: sensord.service
Source3: sensorfwd.service
Requires: %{name}-configs
Requires: sensord-qt5
Requires(post): /sbin/ldconfig
......@@ -55,7 +55,7 @@ Sensorfw configuration files.
%build
unset LD_AS_NEEDED
export LD_RUN_PATH=/usr/lib/sensord/
export LD_RUN_PATH=/usr/lib/sensord-qt5/
export QT_SELECT=5
%qmake5 CONFIG+=hybris
......
......@@ -7,7 +7,7 @@ License: LGPLv2+
URL: http://gitorious.org/sensorfw
Source0: %{name}-%{version}.tar.bz2
Source1: sensorfw-rpmlintrc
Source2: sensord.service
Source2: sensorfwd.service
Source3: sensord-daemon-conf-setup
Requires: qt5-qtcore
Requires: sensord-configs
......@@ -79,7 +79,7 @@ Sensorfw configuration files.
%build
unset LD_AS_NEEDED
export LD_RUN_PATH=/usr/lib/sensord/
export LD_RUN_PATH=/usr/lib/sensord-qt5/
export QT_SELECT=5
%qmake5 \
......@@ -92,21 +92,21 @@ rm -rf %{buildroot}
export QT_SELECT=5
%qmake5_install
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/sensord.service
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/sensorfwd.service
install -D -m750 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/sensord-daemon-conf-setup
mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants
ln -s ../sensord.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensord.service
ln -s ../sensorfwd.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensorfwd.service
%preun
if [ "$1" -eq 0 ]; then
systemctl stop sensord.service || :
systemctl stop sensorfwd.service || :
fi
%post
/sbin/ldconfig
systemctl daemon-reload || :
systemctl reload-or-try-restart sensord.service || :
systemctl reload-or-try-restart sensorfwd.service || :
%postun
/sbin/ldconfig
......@@ -120,7 +120,7 @@ systemctl daemon-reload || :
%defattr(-,root,root,-)
%{_libdir}/libsensorclient-qt5.so.*
%{_libdir}/libsensordatatypes-qt5.so.*
%attr(755,root,root)%{_sbindir}/sensord
%attr(755,root,root)%{_sbindir}/sensorfwd
%dir %{_libdir}/sensord-qt5
%{_libdir}/sensord-qt5/*.so
%{_libdir}/libsensorfw*.so.*
......@@ -129,8 +129,8 @@ systemctl daemon-reload || :
%dir %{_sysconfdir}/sensorfw
%config %{_sysconfdir}/sensorfw/sensord.conf
%dir %{_sysconfdir}/sensorfw/sensord.conf.d/
%{_unitdir}/sensord.service
%{_unitdir}/graphical.target.wants/sensord.service
%{_unitdir}/sensorfwd.service
%{_unitdir}/graphical.target.wants/sensorfwd.service
%{_bindir}/sensord-daemon-conf-setup
%files devel
......
......@@ -8,7 +8,7 @@ Conflicts=actdead.target
Type=forking
BusName=com.nokia.SensorService
ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
RestartSec=1
......
......@@ -14,6 +14,6 @@ script
if [ "$PRODUCT" = "RM-696" ]; then
CONFIG="/etc/sensorfw/sensord-rm_696.conf"
fi
exec /usr/sbin/sensord -c="$CONFIG"
exec /usr/sbin/sensorfwd -c="$CONFIG"
end script
......@@ -14,14 +14,14 @@
# source function library
. /etc/rc.d/init.d/functions
servicename=sensord
processname=sensord
servicename=sensorfwd
processname=sensorfwd
sbindir=/usr/sbin
RETVAL=0
start() {
echo -n "Starting sensord: "
echo -n "Starting sensorfwd: "
CONFIG="/etc/sensorfw/sensord-ncdk.conf"
exec $sbindir/$processname -c "$CONFIG" &> /dev/null &
RETVAL=$?
......
......@@ -3,8 +3,7 @@ QT += network
TEMPLATE = app
include( ../common-config.pri )
#don't change target name in qt5
TARGET = sensord
TARGET = sensorfwd
CONFIG += console \
link_pkgconfig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment