diff options
Diffstat (limited to 'meta-phosphor/common')
3 files changed, 11 insertions, 11 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index 95eaea1e4..eb9513b5b 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -24,36 +24,36 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" START_TMPL = "op-power-start@.service" START_TGTFMT = "obmc-power-chassis-on@{1}.target" START_INSTFMT = "op-power-start@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.wants/${START_INSTFMT}" +START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" STOP_TMPL = "op-power-stop@.service" STOP_TGTFMT = "obmc-power-chassis-off@{1}.target" STOP_INSTFMT = "op-power-stop@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.wants/${STOP_INSTFMT}" +STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" ON_TMPL = "op-wait-power-on@.service" ON_INSTFMT = "op-wait-power-on@{0}.service" -ON_FMT = "../${ON_TMPL}:${START_TGTFMT}.wants/${ON_INSTFMT}" +ON_FMT = "../${ON_TMPL}:${START_TGTFMT}.requires/${ON_INSTFMT}" OFF_TMPL = "op-wait-power-off@.service" OFF_INSTFMT = "op-wait-power-off@{0}.service" -OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.wants/${OFF_INSTFMT}" +OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.requires/${OFF_INSTFMT}" -# Build up wants relationship for START_TGTFMT and STOP_TGTFMT +# Build up requires relationship for START_TGTFMT and STOP_TGTFMT SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -# Now show that the main control target wants these power targets +# Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-power-chassis-on@.target" START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target" START_INSTFMT_CTRL = "obmc-power-chassis-on@{0}.target" -START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.wants/${START_INSTFMT_CTRL}" +START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" STOP_TMPL_CTRL = "obmc-power-chassis-off@.target" STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target" STOP_INSTFMT_CTRL = "obmc-power-chassis-off@{0}.target" -STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.wants/${STOP_INSTFMT_CTRL}" +STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb index 558690303..77017e31c 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb @@ -14,12 +14,12 @@ SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.servi START_TMPL = "obmc-start-watchdog@.service" START_TGTFMT = "obmc-chassis-start@{1}.target" START_INSTFMT = "obmc-start-watchdog@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.wants/${START_INSTFMT}" +START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" STOP_TMPL = "obmc-stop-watchdog@.service" STOP_TGTFMT = "obmc-chassis-stop@{1}.target" STOP_INSTFMT = "obmc-stop-watchdog@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.wants/${STOP_INSTFMT}" +STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb index 2b5e8b1dc..fba82d8cc 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb @@ -17,6 +17,6 @@ SYSTEMD_SERVICE_${PN} = "op-start-host@.service" START_TMPL = "op-start-host@.service" START_TGTFMT = "obmc-chassis-start@{1}.target" START_INSTFMT = "obmc-start-host@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.wants/${START_INSTFMT}" +START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" |
