From eeae33c28cc4bda55d6db4a6dc144b8f1833ff2f Mon Sep 17 00:00:00 2001 From: Vishwanatha Subbanna Date: Tue, 13 Jun 2017 15:00:24 +0530 Subject: Add openpower-debug-collector-watchdog to host-timeout target When the host watchdog times out, we need some kind of debug data before it is taken to quiesce state. Change-Id: I3ca2ff033c2f0d9f5484b06c9ebe831b500d6df2 Signed-off-by: Vishwanatha Subbanna --- .../common/recipes-phosphor/debug/openpower-debug-collector.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb index 21737de4e..41c6e2e38 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb @@ -1,5 +1,5 @@ SUMMARY = "OpenPOWER Debug Collector" -DESCRIPTION = "Application to log error during host checkstop" +DESCRIPTION = "Application to log error during host checkstop and watchdog timeout" PR = "r1" @@ -34,10 +34,11 @@ CRASH_TGTFMT = "obmc-host-crash@{0}.target" CHECKSTOP_INSTFMT = "openpower-debug-collector-checkstop@{0}.service" CRASH_CHECKSTOP_FMT = "../${CHECKSTOP_TMPL}:${CRASH_TGTFMT}.wants/${CHECKSTOP_INSTFMT}" -# For now, just create a watchdog symlink in base +# Make watchdog part of obmc-host-timeout target WDOG_TMPL = "openpower-debug-collector-watchdog@.service" +TIMEOUT_TGTFMT = "obmc-host-timeout@{0}.target" WDOG_INSTFMT = "openpower-debug-collector-watchdog@{0}.service" -LINK_FMT = "${WDOG_TMPL}:${WDOG_INSTFMT}" +TIMEOUT_WDOG_FMT = "../${WDOG_TMPL}:${TIMEOUT_TGTFMT}.wants/${WDOG_INSTFMT}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_CHECKSTOP_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'TIMEOUT_WDOG_FMT', 'OBMC_HOST_INSTANCES')}" -- cgit v1.2.1