Merge branch 'herrie/ls2new' into 'master'

sensorfw: Include updated patches for LuneOS and migrate to LS2 ACG model See merge request mer-core/sensorfw!47
sailfishos · Jan 13, 2020 · 4f97982 · 4f97982
2 parents 2b65a1a + 95d5295
commit 4f97982
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/...S/sysbus/com.nokia.SensorService.json.prv → .../sysbus/com.nokia.SensorService.role.json b/...S/sysbus/com.nokia.SensorService.json.prv → .../sysbus/com.nokia.SensorService.role.json
@@ -1,9 +1,7 @@
 {
-    "role": {
-        "exeName":"/usr/sbin/sensorfwd",
-        "type": "privileged",
-        "allowedNames": ["com.nokia.SensorService"]
-    },
+    "exeName":"/usr/sbin/sensorfwd",
+    "type": "privileged",
+    "allowedNames": ["com.nokia.SensorService"],
     "permissions": [
         {
             "service":"com.nokia.SensorService",

diff --git a/LuneOS/sysbus/com.nokia.SensorService.service b/LuneOS/sysbus/com.nokia.SensorService.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.nokia.SensorService
+Exec=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf
+Type=static
diff --git a/LuneOS/sysbus/com.nokia.SensorService.service.prv b/LuneOS/sysbus/com.nokia.SensorService.service.prv
diff --git a/LuneOS/systemd/sensorfwd.service b/LuneOS/systemd/sensorfwd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Sensor daemon for sensor framework
-After=dbus.socket ls-hubd_private.service
-Requires=dbus.service ls-hubd_private.service
+After=dbus.socket ls-hubd.service
+Requires=dbus.service ls-hubd.service
 Conflicts=actdead.target
 
 [Service]