From 47acdb1e0d19b920c39f0cc470822fdac4ecb11a Mon Sep 17 00:00:00 2001 From: Shantappa Teekappanavar Date: Tue, 24 Aug 2021 22:08:31 -0500 Subject: openpower-debug-collector: Fix watchdog-timeout systemd service link issues This commit: - fixes missing "@" in the openpower-debug-collector-watchdog-timeout@.service file path. - Adds openpower-debug-collector-watchdog-timeout@.service file to the /lib/systemd/system directory. Testing: Installed the image on simics and verified that the watchdog-timeout systemd service file was added to /lib/systemd/system directory. Signed-off-by: Shantappa Teekappanavar Change-Id: Id6d9309d35bf218a2b458548f8a9dc6b7cc0a58c --- .../debug/openpower-debug-collector-systemd-links.inc | 2 +- .../recipes-phosphor/debug/openpower-debug-collector_git.bb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index f681ed498..5109a2fba 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -16,7 +16,7 @@ pkg_postinst:${PN}:append() { ln -s $TARGET $LINK LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" - TARGET="../openpower-debug-collector-watchdog-timeout.service" + TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK } diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index b6fa24770..4a5aa3feb 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -19,14 +19,13 @@ DEPENDS += " \ " S = "${WORKDIR}/git" -# This provides below 2 applications that are called into in case -# of host checkstop and host watchdog timeout respectively. -APPS = "checkstop watchdog" +# This provides below applications that are called into in case +# of host checkstop, host watchdog and host watchdog-timeout respectively. +APPS = "checkstop watchdog watchdog-timeout" DEBUG_TMPL = "openpower-debug-collector-{0}@.service" SYSTEMD_SERVICE:${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" - # Do not depend on phosphor-logging for native build DEPENDS:remove:class-native = "phosphor-logging" -- cgit v1.2.3