diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2022-12-09 05:03:53 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2022-12-09 05:03:53 +0300 |
| commit | fa06f1f6d276d607d7431f5d4a0c86a77d35194b (patch) | |
| tree | 5b384009906253a664414a91941180db3fc05a19 | |
| parent | c2190e6d277e78fd2c53b43000c454ef8d7488f0 (diff) | |
| download | openbmc-fa06f1f6d276d607d7431f5d4a0c86a77d35194b.tar.xz | |
meta-ampere: mtjade: fix target dependency
Some targets were changed in phosphor-state-manager at commit 86a1ebf9
"move chassis power services to phosphor-state-manager" which makes our
dependency incorrect.
This commit fixes the target dependency to work with new change
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I2c2b321161db367a86b5c1dc86071abab04f03b9
4 files changed, 5 insertions, 5 deletions
diff --git a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb index 3f9babba9b..54c14d491d 100644 --- a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb @@ -42,10 +42,10 @@ HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}" -# append on op-wait-power-on +# append on phosphor-wait-power-on AMPERE_POWER_ON_TGT = "obmc-power-already-on@.target" AMPERE_POWER_ON_INSTMPL = "obmc-power-already-on@{0}.target" -OP_WAIT_POWER_ON = "op-wait-power-on@{0}.service" +OP_WAIT_POWER_ON = "phosphor-wait-power-on@{0}.service" AMPERE_POWER_ON_TARGET_FMT = "../${AMPERE_POWER_ON_TGT}:${OP_WAIT_POWER_ON}.wants/${AMPERE_POWER_ON_INSTMPL}" SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'AMPERE_POWER_ON_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target index 63699cf8b2..868348ec2a 100644 --- a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target +++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target @@ -1,5 +1,5 @@ [Unit] Description=Ampere power %i already on target -After=op-wait-power-on@%i.service +After=phosphor-wait-power-on@%i.service Conflicts=obmc-chassis-poweroff@%i.target Conflicts=ampere-host-shutdown-ack@%i.service diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service index ce59894aa1..543b852946 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service @@ -1,6 +1,6 @@ [Unit] Description=Ampere set GPIOs before power off -Before=op-wait-power-off@%i.service +Before=phosphor-wait-power-off@%i.service Conflicts=obmc-chassis-poweron@%i.target [Service] diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service index e7131a1776..ec2cd68e20 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service @@ -1,6 +1,6 @@ [Unit] Description=Ampere set GPIOs before power on -Before=op-wait-power-on@%i.service +Before=phosphor-wait-power-on@%i.service After=obmc-power-start-pre@%i.target Conflicts=obmc-chassis-poweroff@%i.target |