From 3c35a8c009ae5c2b093b0bbe28c48d82f345e58e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Feb 2017 15:54:25 -0600 Subject: Change wants to requires for all critical services In order for targets to fail when their services fail, the relationship must be a "requires" Change-Id: I1523dd51af8817b473557bac65e9e71eacecf52e Signed-off-by: Andrew Geissler --- .../common/recipes-phosphor/host/p9-host-start.bb | 2 +- .../common/recipes-phosphor/host/p9-vcs-workaround.bb | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 6 +++--- .../recipes-phosphor/chassis/vcs-pre-post.bb | 8 ++++---- .../recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/fans/fan-default-speed.bb | 2 +- .../recipes-phosphor/chassis/obmc-op-control-power.bb | 16 ++++++++-------- .../common/recipes-phosphor/chassis/obmc-watchdog.bb | 4 ++-- .../common/recipes-phosphor/host/obmc-op-control-host.bb | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb index 3f7bf2bf0..16d24c79a 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb @@ -25,7 +25,7 @@ do_install() { TMPL = "start_host@.service" INSTFMT = "start_host@{0}.service" TGTFMT = "obmc-chassis-start@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb index 12b8357db..b03e26c0c 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb @@ -22,7 +22,7 @@ do_install() { TMPL = "vcs_workaround@.service" INSTFMT = "vcs_workaround@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb index daca634f6..25af11261 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb @@ -28,9 +28,9 @@ INSTFMT_EN= "avsbus-enable@{0}.service" INSTFMT_DIS= "avsbus-disable@{0}.service" INSTFMT_WA= "avsbus-workaround@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" -FMT_EN = "../${TMPL_EN}:${TGTFMT}.wants/${INSTFMT_EN}" -FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.wants/${INSTFMT_DIS}" -FMT_WA = "../${TMPL_WA}:${TGTFMT}.wants/${INSTFMT_WA}" +FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" +FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" +FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb index 1cebcc729..ec7eecaf9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb @@ -33,10 +33,10 @@ INSTFMT_ON = "vcs_on@{0}.service" INSTFMT_UCD = "ucd_disable_vcs@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" TGTFMT_OFF= "obmc-power-chassis-off@{0}.target" -FMT_OFF = "../${TMPL_OFF}:${TGTFMT}.wants/${INSTFMT_OFF}" -FMT_ON = "../${TMPL_ON}:${TGTFMT}.wants/${INSTFMT_ON}" -FMT_UCD = "../${TMPL_UCD}:${TGTFMT}.wants/${INSTFMT_UCD}" -FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.wants/${INSTFMT_OFF_PO}" +FMT_OFF = "../${TMPL_OFF}:${TGTFMT}.requires/${INSTFMT_OFF}" +FMT_ON = "../${TMPL_ON}:${TGTFMT}.requires/${INSTFMT_ON}" +FMT_UCD = "../${TMPL_UCD}:${TGTFMT}.requires/${INSTFMT_UCD}" +FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.requires/${INSTFMT_OFF_PO}" SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb index 7d577cc38..ba745bdf4 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb @@ -18,7 +18,7 @@ do_install() { TMPL = "vrm-control@.service" INSTFMT = "vrm-control@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb index a758c917a..c98af0b46 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb @@ -14,7 +14,7 @@ SRC_URI += "file://set_fan_speeds.sh" TMPL = "fan-default-speed@.service" INSTFMT = "fan-default-speed@{0}.service" TGTFMT = "obmc-chassis-start@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" 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')}" -- cgit v1.2.1