sensorfw: Include updated patches for LuneOS and migrate to LS2 ACG m…

…odel Integrate patches for dbus and systemd currently applied during build in LuneOS. As well as migration to webOS OSE's LS2 ACG model. Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
sailfishos · Dec 16, 2019 · 95d5295 · 95d5295
1 parent 2b65a1a
commit 95d5295
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]