diff options
Diffstat (limited to 'meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb')
-rw-r--r-- | meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index 327053cc9..5e41d6b9e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -10,14 +10,13 @@ inherit obmc-phosphor-systemd S = "${WORKDIR}" SRC_URI = "file://ampere-host-shutdown.service \ - file://ampere-host-reset.service \ file://ampere_power_util.sh \ file://ampere-chassis-poweroff.service \ file://ampere-chassis-poweron.service \ file://ampere-chassis-powercycle.service \ file://ampere-host-shutdown-ack.service \ - file://ampere-host-force-reset.service \ file://ampere-host-power-cycle.service \ + file://ampere-host-reset.service \ " DEPENDS = "systemd" @@ -26,13 +25,12 @@ RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = " \ ampere-host-shutdown.service \ - ampere-host-reset.service \ ampere-chassis-poweroff.service \ ampere-chassis-poweron.service \ ampere-chassis-powercycle.service \ ampere-host-shutdown-ack.service \ - ampere-host-force-reset.service \ ampere-host-power-cycle.service \ + ampere-host-reset.service \ " # host power control # overwrite the host shutdown to graceful shutdown @@ -47,18 +45,6 @@ HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" -# overwrite the host reset to graceful reset -HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" -HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" -HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -# overwrite force reboot -HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" -HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" -HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" - # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" @@ -73,7 +59,7 @@ SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHAS CHASSIS_POWERCYCLE_SVC = "ampere-chassis-powercycle.service" CHASSIS_POWERCYCLE_TGTFMT = "obmc-chassis-powercycle@{0}.target" CHASSIS_POWERCYCLE_FMT = "../${CHASSIS_POWERCYCLE_SVC}:${CHASSIS_POWERCYCLE_TGTFMT}.requires/${CHASSIS_POWERCYCLE_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERCYCLE_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERCYCLE_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" @@ -85,4 +71,3 @@ do_install() { install -d ${D}/usr/sbin install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh } - |