Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sensorfw
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
mer-core
sensorfw
Commits
f2cb5f33
Commit
f2cb5f33
authored
Dec 16, 2014
by
lpotter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename sensord daemon to sensorfwd
parent
99b55814
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
19 deletions
+18
-19
rpm/sensord-daemon-conf-setup
rpm/sensord-daemon-conf-setup
+1
-1
rpm/sensorfw-qt5-hybris.spec
rpm/sensorfw-qt5-hybris.spec
+2
-2
rpm/sensorfw-qt5.spec
rpm/sensorfw-qt5.spec
+9
-9
rpm/sensorfwd.service
rpm/sensorfwd.service
+1
-1
sensord.conf
sensord.conf
+1
-1
sensord.init
sensord.init
+3
-3
sensord/sensord.pro
sensord/sensord.pro
+1
-2
No files found.
rpm/sensord-daemon-conf-setup
View file @
f2cb5f33
...
...
@@ -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/sensor
fw
d
]
;
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)
...
...
rpm/sensorfw-qt5-hybris.spec
View file @
f2cb5f33
...
...
@@ -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: sensor
fw
d.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
...
...
rpm/sensorfw-qt5.spec
View file @
f2cb5f33
...
...
@@ -7,7 +7,7 @@ License: LGPLv2+
URL: http://gitorious.org/sensorfw
Source0: %{name}-%{version}.tar.bz2
Source1: sensorfw-rpmlintrc
Source2: sensord.service
Source2: sensor
fw
d.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}/sensor
fw
d.service
install -D -m750 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/sensord-daemon-conf-setup
mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants
ln -s ../sensor
d.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensor
d.service
ln -s ../sensor
fwd.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensorfw
d.service
%preun
if [ "$1" -eq 0 ]; then
systemctl stop sensord.service || :
systemctl stop sensor
fw
d.service || :
fi
%post
/sbin/ldconfig
systemctl daemon-reload || :
systemctl reload-or-try-restart sensord.service || :
systemctl reload-or-try-restart sensor
fw
d.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}/sensor
fw
d
%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}/sensor
fw
d.service
%{_unitdir}/graphical.target.wants/sensor
fw
d.service
%{_bindir}/sensord-daemon-conf-setup
%files devel
...
...
rpm/sensord.service
→
rpm/sensor
fw
d.service
View file @
f2cb5f33
...
...
@@ -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/sensor
fw
d -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
RestartSec=1
...
...
sensord.conf
View file @
f2cb5f33
...
...
@@ -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
/
sensor
fw
d
-
c
=
"$CONFIG"
end
script
sensord.init
View file @
f2cb5f33
...
...
@@ -14,14 +14,14 @@
# source function library
.
/etc/rc.d/init.d/functions
servicename
=
sensord
processname
=
sensord
servicename
=
sensor
fw
d
processname
=
sensor
fw
d
sbindir
=
/usr/sbin
RETVAL
=
0
start
()
{
echo
-n
"Starting sensord: "
echo
-n
"Starting sensor
fw
d: "
CONFIG
=
"/etc/sensorfw/sensord-ncdk.conf"
exec
$sbindir
/
$processname
-c
"
$CONFIG
"
&> /dev/null &
RETVAL
=
$?
...
...
sensord/sensord.pro
View file @
f2cb5f33
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment