diff options
Diffstat (limited to 'meta-openpower/recipes-phosphor/debug')
3 files changed, 23 insertions, 15 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 a3b729ec7..9c522c1cd 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 @@ -1,4 +1,4 @@ -pkg_postinst_${PN}_append() { +pkg_postinst:${PN}:append() { mkdir -p $D$systemd_system_unitdir/obmc-host-crash@0.target.wants mkdir -p $D$systemd_system_unitdir/obmc-host-timeout@0.target.wants @@ -15,18 +15,22 @@ pkg_postinst_${PN}_append() { TARGET="../openpower-debug-collector-watchdog@.service" 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" - ln -s $TARGET $LINK + if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + 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" + ln -s $TARGET $LINK + fi } -pkg_prerm_${PN}_append() { +pkg_prerm:${PN}:append() { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'mpreboot', d)}" != mpreboot ]; then LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" rm $LINK fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" - rm $LINK + if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" + rm $LINK + fi } diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 821d75804..efeaf1f3d 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector" -SRCREV = "bce0d4a571c9ce3f62ad6c2bda6d32f26eb238c8" +SRCREV = "9b6f8474a4e33dbfda233dedceedf4c030ffd0ec" 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 482aaaf9d..68965af0a 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -15,19 +15,23 @@ require ${BPN}-systemd-links.inc DEPENDS += " \ phosphor-logging \ ${PYTHON_PN}-sdbus++-native \ + cli11 \ " 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 \ + ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" - +SYSTEMD_SERVICE:${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" # Do not depend on phosphor-logging for native build -DEPENDS_remove_class-native = "phosphor-logging" +DEPENDS:remove:class-native = "phosphor-logging" # Do not depend on phosphor-logging for native SDK build -DEPENDS_remove_class-nativesdk = "phosphor-logging" +DEPENDS:remove:class-nativesdk = "phosphor-logging" |