From b16a6a7d684ed56e8006f920d264d0781464aea7 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 23 Sep 2021 03:20:07 +0000 Subject: meta-ampere: mtjade: update dependency for mac-update The ampere_update_mac service gets BMC MAC Address from FruDevice but currently uses Inventory.Manager as its dependency. This makes the service sometime not work correctly. This commit updates the dependency to EntityManager to fix the issue Tested: 1. Clear eth1addr variable. Do A/C power the BMC and ensure the BMC MAC is set to eth1addr 2. Clear eth1addr variable. Reboot BMC and ensure the BMC MAC is set to eth1addr Signed-off-by: Thang Q. Nguyen Change-Id: I00c78222d487c72db5e6e06f8cc8b45cfde2f253 --- .../platform/ampere-mac-update/ampere_update_mac.service | 5 +++-- .../packagegroups/packagegroup-obmc-apps.bbappend | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service index 86f7a0346..3425e4571 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service @@ -1,9 +1,10 @@ [Unit] Description=Updating MAC Address Service From FRU inventory -After=xyz.openbmc_project.Inventory.Manager.service +Requires=xyz.openbmc_project.EntityManager.service +After=xyz.openbmc_project.EntityManager.service [Service] -ExecStart=/usr/sbin/ampere_update_mac.sh +ExecStart=/usr/bin/env ampere_update_mac.sh SyslogIdentifier=ampere_update_mac.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index e9e6aa0ad..7136be64f 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,6 +1,14 @@ -RDEPENDS:${PN}-extras:append:mtjade = " webui-vue phosphor-image-signing phosphor-virtual-sensor" -RDEPENDS:${PN}-inventory:append:mtjade = " fault-monitor id-button psu-hotswap-reset" +RDEPENDS:${PN}-extras:append:mtjade = " \ + webui-vue \ + phosphor-image-signing \ + phosphor-virtual-sensor \ + " RDEPENDS:${PN}-inventory:append:mtjade = " \ - host-gpio-handling \ + fault-monitor \ + id-button \ + psu-hotswap-reset \ + host-gpio-handling \ + dbus-sensors \ + entity-manager \ " -- cgit v1.2.3