From b5fa3edeb3a00340da5460538be48c069231843f Mon Sep 17 00:00:00 2001
From: leenaS-d <leena.d@tataelxsi.co.in>
Date: Tue, 10 Dec 2024 19:40:33 +0000
Subject: [PATCH] RDKVREFPLT-4241: Activate rdkshell plugin via systemd service

Reason for change: RDK UI is not coming up on rdkshell supported platforms

Signed-off-by: leenaS-d <leena.d@tataelxsi.co.in>
---
 .../files/00-activate-rdkshell.conf           |  4 ++++
 .../files/wpeframework-rdkshell.service       | 12 ++++++++++++
 recipes-apps/rdkresidentapp/rdkresidentapp.bb | 19 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 recipes-apps/rdkresidentapp/files/00-activate-rdkshell.conf
 create mode 100644 recipes-apps/rdkresidentapp/files/wpeframework-rdkshell.service

diff --git a/recipes-apps/rdkresidentapp/files/00-activate-rdkshell.conf b/recipes-apps/rdkresidentapp/files/00-activate-rdkshell.conf
new file mode 100644
index 0000000..9789e67
--- /dev/null
+++ b/recipes-apps/rdkresidentapp/files/00-activate-rdkshell.conf
@@ -0,0 +1,4 @@
+# To activate rdkshell plugin before residentapp
+After=wpeframework-rdkshell.service
+Requires= wpeframework-rdkshell.service
+
diff --git a/recipes-apps/rdkresidentapp/files/wpeframework-rdkshell.service b/recipes-apps/rdkresidentapp/files/wpeframework-rdkshell.service
new file mode 100644
index 0000000..e8ad6b2
--- /dev/null
+++ b/recipes-apps/rdkresidentapp/files/wpeframework-rdkshell.service
@@ -0,0 +1,12 @@
+# To do: Remove whrn RDKEMW-671 is released
+
+
+[Unit]
+Description=WPEFramework RDKShell Initialiser
+Requires=wpeframework.service iarmbusd.service dsmgr.service
+After=wpeframework.service iarmbusd.service dsmgr.service\
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.RDKShell
diff --git a/recipes-apps/rdkresidentapp/rdkresidentapp.bb b/recipes-apps/rdkresidentapp/rdkresidentapp.bb
index bec5a26..59f38ce 100644
--- a/recipes-apps/rdkresidentapp/rdkresidentapp.bb
+++ b/recipes-apps/rdkresidentapp/rdkresidentapp.bb
@@ -23,6 +23,11 @@ SRC_URI = "${CMF_GIT_ROOT}/rdk/components/generic/appmanager;protocol=${CMF_GIT_
 # FIXME: Move to a common config
 SRC_URI += "file://ref-webui-docroot-path.conf"
 
+SRC_URI += "file://00-activate-rdkshell.conf"
+
+# Remove once RDKEMW-671 is release. Workaround to fix UI issue
+SRC_URI += "file://wpeframework-rdkshell.service"
+
 SRCREV_generic = "${AUTOREV}"
 SRCREV_FORMAT = "generic"
 
@@ -30,10 +35,17 @@ do_install() {
    install -d ${D}${systemd_unitdir}/system
    install -m 0644 ${S}/resources/systemd/residentapp.service ${D}${systemd_unitdir}/system/residentapp.service
 
+   install -D -m 0644 ${WORKDIR}/00-activate-rdkshell.conf ${D}${systemd_unitdir}/system/residentapp.service.d/00-activate-rdkshell.conf
+
    install -d ${D}/lib/rdk
    install -m 0755 ${S}/residentapp/residentApp.sh ${D}/lib/rdk/residentApp.sh
 }
 
+# Remove once RDKEMW-671 is release. Workaround to fix UI issue
+do_install_append() {
+   install -m 0644 ${S}/resources/systemd/wpeframework-rdkshell.service ${D}${systemd_unitdir}/system/wpeframework-rdkshell.service
+}
+
 # FIXME: Move to a common config
 do_install_append() {
     install -d ${D}${sysconfdir}/lighttpd.d
@@ -43,3 +55,10 @@ do_install_append() {
 SYSTEMD_SERVICE_${PN} = "residentapp.service"
 FILES_${PN} += "${systemd_unitdir}/system/residentapp.service"
 FILES_${PN} += "/lib/rdk/residentApp.sh"
+FILES_${PN} += "${systemd_unitdir}/system/residentapp.service.d/*"
+
+
+# Remove once RDKEMW-671 is release. Workaround to fix UI issue
+SYSTEMD_SERVICE_${PN} += "wpeframework-rdkshell.service"
+FILES_${PN} += "${systemd_unitdir}/system/wpeframework-rdkshell.service"
+