From feb59cb0723d9b3b0afb27e05869fa6d2a42bc6c Mon Sep 17 00:00:00 2001 From: Lei YU Date: Mon, 20 Feb 2017 10:22:27 +0800 Subject: meta-romulus: Change wants to requires for power on services In order for targets to fail when their services fail, the relationship must be a "requires" Change-Id: I9be703179caff8276572c32ecca84209e42448cf Signed-off-by: Lei YU --- .../meta-romulus/recipes-phosphor/chassis/avsbus-control.bb | 6 +++--- .../meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb | 4 ++-- .../meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index 20ecedade..3c3be27c7 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/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-romulus/recipes-phosphor/chassis/cpld-trigger.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb index 41ff1f6bb..129390dea 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb @@ -26,8 +26,8 @@ INSTFMT = "cpld_trigger@{0}.service" INSTFMT_RESET = "cpld_reset@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" TGTFMT_RESET = "obmc-power-chassis-off@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" -FMT_RESET = "../${TMPL_RESET}:${TGTFMT_RESET}.wants/${INSTFMT_RESET}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" +FMT_RESET = "../${TMPL_RESET}:${TGTFMT_RESET}.requires/${INSTFMT_RESET}" 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-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 5adffe71a..73c828224 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -20,7 +20,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')}" -- cgit v1.2.1