diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-09-23 06:20:07 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-09-27 08:50:41 +0300 |
| commit | b16a6a7d684ed56e8006f920d264d0781464aea7 (patch) | |
| tree | 63dcb1cdddafcd96ebd51e9505c6d77f12ca26ce | |
| parent | 94c424a17ebd9f139562f58101586528638483ff (diff) | |
| download | openbmc-b16a6a7d684ed56e8006f920d264d0781464aea7.tar.xz | |
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 <thang@os.amperecomputing.com>
Change-Id: I00c78222d487c72db5e6e06f8cc8b45cfde2f253
| -rw-r--r-- | meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service | 5 | ||||
| -rw-r--r-- | meta-ampere/meta-jade/recipes-phosphor/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 \ " |