From 2848a3d0591c7d0c9e97f208f00899a0f254ad0a Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 22 Nov 2022 03:36:44 -0500
Subject: [PATCH] native-shell-client: Add systemd unit

Add a bbappend for native-shell-client to add a systemd unit that
runs in the agl-driver user session.  This is required to actually
get it started if it is built into an image.

Bug-AGL: SPEC-4618

Change-Id: If6c1c015544ee6f126fb30ca67822a38a83df64c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../native-shell-client/files/native-shell-client.service   | 11 +++++++++++
 .../native-shell-client/native-shell-client_agldemo.inc     | 13 +++++++++++++
 .../native-shell-client/native-shell-client_git.bbappend    |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 recipes-demo/native-shell-client/files/native-shell-client.service
 create mode 100644 recipes-demo/native-shell-client/native-shell-client_agldemo.inc
 create mode 100644 recipes-demo/native-shell-client/native-shell-client_git.bbappend

diff --git a/recipes-demo/native-shell-client/files/native-shell-client.service b/recipes-demo/native-shell-client/files/native-shell-client.service
new file mode 100644
index 000000000..4d77513a9
--- /dev/null
+++ b/recipes-demo/native-shell-client/files/native-shell-client.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=agl-compositor.service
+After=agl-compositor.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/native-shell-client
+Restart=on-failure
+
+[Install]
+WantedBy=agl-session.target
diff --git a/recipes-demo/native-shell-client/native-shell-client_agldemo.inc b/recipes-demo/native-shell-client/native-shell-client_agldemo.inc
new file mode 100644
index 000000000..5e2538ee3
--- /dev/null
+++ b/recipes-demo/native-shell-client/native-shell-client_agldemo.inc
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://native-shell-client.service"
+
+do_install:append() {
+    install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
+    install -m0644 ${WORKDIR}/native-shell-client.service ${D}${systemd_user_unitdir}/native-shell-client.service
+    ln -s ../native-shell-client.service ${D}${systemd_user_unitdir}/agl-session.target.wants/native-shell-client.service
+}
+
+FILES:${PN} += " ${systemd_user_unitdir}"
+
+RCONFLICTS:${PN} = "homescreen"
diff --git a/recipes-demo/native-shell-client/native-shell-client_git.bbappend b/recipes-demo/native-shell-client/native-shell-client_git.bbappend
new file mode 100644
index 000000000..0f2cf7595
--- /dev/null
+++ b/recipes-demo/native-shell-client/native-shell-client_git.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'native-shell-client_agldemo.inc', '', d)}
-- 
2.16.6