From b11c2a3829fa76a02f1f2ec045e39ab694dca3b0 Mon Sep 17 00:00:00 2001
From: Philippe Coval <philippe.coval@huawei.com>
Date: Wed, 20 Oct 2021 12:12:06 +0200
Subject: [PATCH] blueprint-vending-machine-control-application: Add systemd
service
To start app in graphics session
Control app is started before UI app to avoid inconsistencies
vending-machine-control-application: Move service in package directory
vending-machine-control-application: Fix systemd integration
Relate-to: https://git.ostc-eu.org/OSTC/planning/core-os/-/issues/233
Forwarded: https://git.ostc-eu.org/distro/oniro/-/merge_requests/357
Thanks-to: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Philippe Coval <philippe.coval@huawei.com>
---
.../vending-machine-control-application.service | 17 +++++++++++++++++
.../vending-machine-control-application_git.bb | 9 ++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service
diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service
new file mode 100644
index 00000000..a62cb54f
--- /dev/null
+++ b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+[Unit]
+Description=Vending Machine Control Application
+Requires=weston@root.service
+After=weston@root.service
+
+[Service]
+Environment="WAYLAND_DISPLAY=wayland-0"
+Environment="XDG_RUNTIME_DIR=/run/user/0"
+ExecStart=/usr/bin/vending-machine-control-application
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb
index cb69e775..c46275d9 100644
--- a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb
+++ b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb
@@ -10,14 +10,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba963850f6731c74878fe839d227e675"
SRC_URI = "git://git.ostc-eu.org/distro/components/${BPN};protocol=https;branch=main;"
SRCREV = "e21c34cdd9b554978a80699f44fe35077b0dbb90"
+SRC_URI += "file://${BPN}.service"
S = "${WORKDIR}/git"
DEPENDS="json-c libwebsockets"
-inherit pkgconfig features_check
+inherit pkgconfig features_check systemd
+
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
EXTRA_OEMAKE += "DESTDIR=${D}"
do_install() {
oe_runmake install
+ install -d "${D}${systemd_system_unitdir}/"
+ install -m 0644 "${WORKDIR}/${BPN}.service" "${D}${systemd_system_unitdir}/"
}
--
GitLab