Signed-off-by: Hongmei Gou <a0271...@ti.com>
---
.../recipes-core/matrix/matrix-gui/matrix-gui-2.0.service | 10 ++++++++++
meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb | 15 +++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644
meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
diff --git
a/meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
b/meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
new file mode 100644
index 0000000..3ce1024
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Matrix GUI
+After=weston.service
+
+[Service]
+Type=forking
+ExecStart=/etc/init.d/matrix-gui-2.0 start
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index d8aa00b..c79f13e 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -6,14 +6,13 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"
SECTION = "multimedia"
-PR = "r35"
+PR = "r36"
-INITSCRIPT_NAME = "matrix-gui-2.0"
-INITSCRIPT_PARAMS = "defaults 97"
+SYSTEMD_SERVICE_${PN} = "matrix-gui-2.0.service"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit update-rc.d
+inherit systemd
BRANCH ?= "master"
SRCREV = "9a2d12590102fefc5c29fc9e8d346ce6b0198468"
@@ -23,6 +22,7 @@ MATRIX_INITSCRIPT = "${@base_conditional('QT_PROVIDER',
'qt5', bb.utils.contains
SRC_URI =
"git://git.ti.com/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH}
\
file://${MATRIX_INITSCRIPT} \
file://php.ini \
+ file://matrix-gui-2.0.service \
${@base_conditional('QT_PROVIDER', 'qt5',
bb.utils.contains('DISTRO_FEATURES', 'wayland', '',
'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d),
'', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', '',
d)} \
"
@@ -46,10 +46,13 @@ do_install(){
sed -i -e "s/__MATRIX_FLAGS__/\"${MATRIX_FLAGS}\"/"
${WORKDIR}/${MATRIX_INITSCRIPT}
sed -i -e "s/__SWITCH_FOREGROUND_VT__/${SWITCH_FOREGROUND_VT}/"
${WORKDIR}/${MATRIX_INITSCRIPT}
- # Install the init script
- # TODO: replace init script with systemd files
+ # Install the script
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/${MATRIX_INITSCRIPT}
${D}${sysconfdir}/init.d/matrix-gui-2.0
+
+ # Install the systemd unit file
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${WORKDIR}/matrix-gui-2.0.service
${D}${systemd_system_unitdir}
}
GUIDEPS = "matrix-gui-browser refresh-screen"
--
1.9.1
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
