From ce338741a2f5cfa62a299e52aa45de03d27920f4 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 4 Nov 2021 13:55:11 +0000
Subject: [PATCH] vending-machine-control-application: Configure default I2C
bus for B68 and Raspberry Pi
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.../vending-machine-control-application.service | 1 +
.../vending-machine-control-application_git.bb | 6 ++++++
2 files changed, 7 insertions(+)
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 1424fc2e..d03da08e 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,6 +7,7 @@ Description=Vending Machine Control Application
[Service]
Type=notify
+Environment="VENDING_MACHINE_CONTROL_I2C_BUS=@VENDING_MACHINE_CONTROL_I2C_BUS@"
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 3751c80a..b4360549 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
@@ -23,8 +23,14 @@ REQUIRED_DISTRO_FEATURES = "systemd"
EXTRA_OEMAKE += "DESTDIR=${D}"
+VENDING_MACHINE_CONTROL_I2C_BUS ??= "0"
+VENDING_MACHINE_CONTROL_I2C_BUS_rpi ?= "1"
+VENDING_MACHINE_CONTROL_I2C_BUS_seco-intel-b68 ?= "2"
+
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"
}
--
GitLab