From 95d5295bac3549ae8ee48ea415be1f71e58788cf Mon Sep 17 00:00:00 2001
From: Herrie <Github.com@herrie.org>
Date: Mon, 16 Dec 2019 09:56:39 +0100
Subject: [PATCH] sensorfw: Include updated patches for LuneOS and migrate to
 LS2 ACG model

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>
---
 ...Service.json.prv => com.nokia.SensorService.role.json} | 8 +++-----
 LuneOS/sysbus/com.nokia.SensorService.service             | 4 ++++
 LuneOS/sysbus/com.nokia.SensorService.service.prv         | 4 ----
 LuneOS/systemd/sensorfwd.service                          | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename LuneOS/sysbus/{com.nokia.SensorService.json.prv => com.nokia.SensorService.role.json} (52%)
 create mode 100644 LuneOS/sysbus/com.nokia.SensorService.service
 delete mode 100644 LuneOS/sysbus/com.nokia.SensorService.service.prv

diff --git a/LuneOS/sysbus/com.nokia.SensorService.json.prv b/LuneOS/sysbus/com.nokia.SensorService.role.json
similarity index 52%
rename from LuneOS/sysbus/com.nokia.SensorService.json.prv
rename to LuneOS/sysbus/com.nokia.SensorService.role.json
index f0f65488..5209691b 100644
--- a/LuneOS/sysbus/com.nokia.SensorService.json.prv
+++ b/LuneOS/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
new file mode 100644
index 00000000..da7df4e8
--- /dev/null
+++ 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
deleted file mode 100644
index 6e7d2185..00000000
--- a/LuneOS/sysbus/com.nokia.SensorService.service.prv
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.SensorService
-Exec=/usr/sbin/sensrofwd
-Type=static
diff --git a/LuneOS/systemd/sensorfwd.service b/LuneOS/systemd/sensorfwd.service
index e4804069..08caefec 100644
--- 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]