|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
|
|
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.7.tar.bz2
^
|
|
[-]
[+]
|
Added |
_service:tar_git:sensord-daemon-conf-setup
^
|
| @@ -0,0 +1,32 @@
+#!/bin/bash
+# Set up a configuration for sensord for "primary use"
+# The way we choose the configuration is as follows:
+# 1. Prefer the hybris plugin (if available)
+# 2. If not, try to pick the best-match from the boardname
+
+cd /etc/sensorfw/
+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)
+ if [ "$(readlink primaryuse.conf)" != sensord-hybris.conf ]; then
+ ln -sf sensord-hybris.conf primaryuse.conf
+ fi
+ elif [ ! -f primaryuse.conf -a -f /etc/boardname ]; then
+ # Determine the correct "primary" config file: the first conf file
+ # whose basename is a substring of boardname, if any (i.e. 'foo.conf'
+ # matches all devices which have 'foo' in their /etc/boardname)
+ for f in sensord-*.conf; do
+ fbase="${f#sensord-}"
+ if grep -q "${fbase%.conf}" /etc/boardname; then
+ # N9/N950 (RM-696/RM-680) boardname containts rm_680 for both
+ # use /proc/1/environ to tell them apart
+ if [ "$f" = "sensord-rm_680.conf" ] && grep -q 'RM-696' /proc/1/environ; then
+ f="sensord-rm_696.conf"
+ fi
+ ln -s $f primaryuse.conf
+ break
+ fi
+ done
+ fi
+fi
|
|
[-]
[+]
|
Deleted |
_service:tar_git:sensorfw-qt5-hybris.inc
^
|
| @@ -1,62 +0,0 @@
-Summary: Sensor Framework Qt5
-License: LGPLv2+
-URL: https://git.sailfishos.org/mer-core/sensorfw
-Source0: %{name}-%{version}.tar.bz2
-# Eventhough this is not really needed we have this here
-# as this is added to packaging dir by tar_git.
-Source2: sensorfwd.service
-Source3: sensorfw-qt5-hybris.inc
-Requires: sensord-qt5
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Test)
-BuildRequires: pkgconfig(mlite5)
-BuildRequires: pkgconfig(sensord-qt5)
-Obsoletes: %{name}-configs <= 0.8.17
-
-%description
-Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.
-
-%package devel
-Summary: Sensor framework daemon libraries development headers
-Requires: %{name} = %{version}-%{release}
-Requires: qt5-qtcore-devel
-Requires: qt5-qtdbus-devel
-Requires: qt5-qtnetwork-devel
-
-%description devel
-Development headers for sensor framework daemon and libraries.
-
-%prep
-%autosetup -n %{name}-%{version}
-
-%build
-unset LD_AS_NEEDED
-export LD_RUN_PATH=%{_libdir}/sensord-qt5/
-
-%qmake5 CONFIG+=hybris %{qmake_extra_parameters} PC_VERSION=`echo %{version} | sed 's/+.*//'`
-
-%make_build
-
-%install
-%qmake5_install
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%license COPYING
-%{_libdir}/libhybrissensorfw*.so.*
-%{_libdir}/libhybrissensorfw*.so
-%{_libdir}/sensord-qt5/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/sensord-qt5/*
|
|
[-]
[+]
|
Added |
_service:tar_git:sensorfw-rpmlintrc
^
|
| @@ -0,0 +1,2 @@
+addFilter("sensorfw-doc.* file-contains-date-and-time")
+addFilter("sensorfw-doc.* file-contains-current-date")
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfwd.service
^
|
| @@ -1,21 +1,17 @@
[Unit]
Description=Sensor daemon for sensor framework
After=dbus.socket
-After=oneshot-root.service
Requires=dbus.service
Conflicts=actdead.target
[Service]
-Type=notify
-ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf --systemd --log-level=warning --no-magnetometer-bg-calibration
+Type=forking
+BusName=com.nokia.SensorService
+ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
+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
-# Sandboxing
-CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=full
[Install]
WantedBy=graphical.target
|
