diff options
author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2017-06-12 13:14:33 +0530 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-15 04:47:58 +0000 |
commit | 15b600cf7c9417a3c4c44b9a47ee3da6c8ba7b17 (patch) | |
tree | 1a1a6bf29e2497d9feca9e3de4b2a64d0fbeee08 | |
parent | 2d78dd05dd61744536cad850b514e1a278500582 (diff) | |
download | talos-openbmc-15b600cf7c9417a3c4c44b9a47ee3da6c8ba7b17.tar.gz talos-openbmc-15b600cf7c9417a3c4c44b9a47ee3da6c8ba7b17.zip |
Watchdog: Remove old host watchdog
Change-Id: I44f248dbe23fe89512aab29da9a38fd56c793287
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
5 files changed, 0 insertions, 76 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 69884ab28..858313db2 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -29,7 +29,6 @@ RDEPENDS_${PN}-chassis = " \ obmc-control-chassis \ obmc-op-control-power \ obmc-pcie-detect \ - obmc-watchdog \ obmc-host-failure-reboots \ " #Pull in obmc-fsi on all P9 OpenPOWER systems diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb deleted file mode 100644 index 72aa0763f..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.Watchdog example implementation" -DESCRIPTION = "A sample implementation for the org.openbmc.Watchdog DBUS API." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service - -SKELETON_DIR = "hostwatchdog" - -FMT = "org.openbmc.watchdog.Host@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_WATCHDOG_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.service" - -START_TMPL = "obmc-start-watchdog@.service" -START_TGTFMT = "obmc-host-start@{1}.target" -START_INSTFMT = "obmc-start-watchdog@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" - -STOP_TMPL = "obmc-stop-watchdog@.service" -STOP_TGTFMT = "obmc-host-stop@{1}.target" -STOP_INSTFMT = "obmc-stop-watchdog@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" - -# Ensure we also call the stop watchdog if the user -# just directly cuts chassis power -CHASSIS_TGTFMT= "obmc-chassis-poweroff@{1}.target" -CHASSIS_FMT = "../${STOP_TMPL}:${CHASSIS_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')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT', 'OBMC_WATCHDOG_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service deleted file mode 100644 index 77ed037a5..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Start Watchdog%i -Wants=obmc-host-started@%i.target -After=obmc-host-started@%i.target -Wants=mapper-wait@-org-openbmc-watchdog-host%i.service -After=mapper-wait@-org-openbmc-watchdog-host%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog set i 30000 -ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog start - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service deleted file mode 100644 index 63f340b3b..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Stop Watchdog%i -Wants=mapper-wait@-org-openbmc-watchdog-host%i.service -After=mapper-wait@-org-openbmc-watchdog-host%i.service -Wants=obmc-host-stop-pre@%i.target -Before=obmc-host-stop-pre@%i.target -Conflicts=obmc-host-start@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog stop - -[Install] -WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service deleted file mode 100644 index 2429c642f..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Watchdog%i - -[Service] -Restart=always -ExecStart={sbindir}/host_watchdog.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} |