From 982f6c49ac8f313999337e6c566827b74ae55744 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 4 Nov 2021 16:33:05 +0000
Subject: [PATCH] vending-machine-control-application: Switch systemd service
to using EnvironmentFile
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.../vending-machine-control-application.service | 2 +-
.../vending-machine-control-application_git.bb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
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
index d03da08e..c3ac416a 100644
--- 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
@@ -7,7 +7,7 @@ Description=Vending Machine Control Application
[Service]
Type=notify
-Environment="VENDING_MACHINE_CONTROL_I2C_BUS=@VENDING_MACHINE_CONTROL_I2C_BUS@"
+EnvironmentFile=-/etc/vending-machine.env
ExecStart=/usr/bin/vending-machine-control-application
Restart=always
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 b4360549..fb9fae8e 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
@@ -31,6 +31,7 @@ do_install() {
oe_runmake install
install -d "${D}${systemd_system_unitdir}/"
install -m 0644 "${WORKDIR}/${BPN}.service" "${D}${systemd_system_unitdir}/"
- sed -i -e 's,@VENDING_MACHINE_CONTROL_I2C_BUS@,${VENDING_MACHINE_CONTROL_I2C_BUS},g' \
- "${D}${systemd_system_unitdir}/${BPN}.service"
+ install -d "${D}${sysconfdir}"
+ echo "VENDING_MACHINE_CONTROL_I2C_BUS=${VENDING_MACHINE_CONTROL_I2C_BUS}" > \
+ "${D}${sysconfdir}/vending-machine.env"
}
--
GitLab