From 48d1ef5d346fa3613e71b4700bc56f1499480cc1 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Sun, 7 Oct 2018 20:31:40 -0700 Subject: meta-openpower: debug-collector: rename as git Rename openpower-debug-collector.bb to openpower-debug-collector_git.bb per OE norms. (From meta-openpower rev: c69639aff81c9aba43d0f221101fe64653493311) Change-Id: I0725aa7d9d7b74320fa767fe2dd3e8051270f702 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../debug/openpower-debug-collector.bb | 77 ---------------------- .../debug/openpower-debug-collector_git.bb | 77 ++++++++++++++++++++++ 2 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb create mode 100644 meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb (limited to 'meta-openpower') diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb deleted file mode 100644 index ac4cd01411..0000000000 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "OpenPOWER Debug Collector" -DESCRIPTION = "Application to log error during host checkstop and watchdog timeout" - -PR = "r1" - -inherit autotools \ - pkgconfig \ - obmc-phosphor-systemd \ - pythonnative \ - phosphor-dbus-yaml - -require ${PN}.inc - -DEPENDS += " \ - phosphor-logging \ - autoconf-archive-native \ - sdbus++-native \ - " -RDEPENDS_${PN} += " \ - phosphor-logging \ - " - -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" - -DEBUG_TMPL = "openpower-debug-collector-{0}@.service" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" - -# This needs to be executed as part of host crash -CHECKSTOP_TMPL = "openpower-debug-collector-checkstop@.service" -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}" - -# 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" -TIMEOUT_WDOG_FMT = "../${WDOG_TMPL}:${TIMEOUT_TGTFMT}.wants/${WDOG_INSTFMT}" - -# Capture debug information on watchdog timeout -DEBUG_WD_TIMEOUT_TMPL = "openpower-debug-collector-watchdog-timeout@.service" -DEBUG_WD_TIMEOUT_INSTFMT = "openpower-debug-collector-watchdog-timeout@{0}.service" -DEBUG_WD_TIMEOUT_FMT = "../${DEBUG_WD_TIMEOUT_TMPL}:${TIMEOUT_TGTFMT}.wants/${DEBUG_WD_TIMEOUT_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_CHECKSTOP_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'TIMEOUT_WDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'DEBUG_WD_TIMEOUT_FMT', 'OBMC_HOST_INSTANCES')}" - -# Do not depend on phosphor-logging for native build -DEPENDS_remove_class-native = "phosphor-logging" - -# Do not depend on phosphor-logging for native SDK build -DEPENDS_remove_class-nativesdk = "phosphor-logging" - -# Provide a means to enable/disable install_error_yaml feature -PACKAGECONFIG ??= "install_error_yaml" -PACKAGECONFIG[install_error_yaml] = " \ - --enable-install_error_yaml, \ - --disable-install_error_yaml, ,\ - " - -# Enable install_error_yaml during native and native SDK build -PACKAGECONFIG_add_class-native = "install_error_yaml" -PACKAGECONFIG_add_class-nativesdk = "install_error_yaml" - -# Disable install_error_yaml during target build -PACKAGECONFIG_remove_class-target = "install_error_yaml" - -# Disable generating elog error header file during bitbake. Applications -# should be using the elog header generated by phosphor-logging recipe -EXTRA_OECONF += "--disable-gen_errors" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb new file mode 100644 index 0000000000..ac4cd01411 --- /dev/null +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -0,0 +1,77 @@ +SUMMARY = "OpenPOWER Debug Collector" +DESCRIPTION = "Application to log error during host checkstop and watchdog timeout" + +PR = "r1" + +inherit autotools \ + pkgconfig \ + obmc-phosphor-systemd \ + pythonnative \ + phosphor-dbus-yaml + +require ${PN}.inc + +DEPENDS += " \ + phosphor-logging \ + autoconf-archive-native \ + sdbus++-native \ + " +RDEPENDS_${PN} += " \ + phosphor-logging \ + " + +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" + +DEBUG_TMPL = "openpower-debug-collector-{0}@.service" +SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" + +# This needs to be executed as part of host crash +CHECKSTOP_TMPL = "openpower-debug-collector-checkstop@.service" +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}" + +# 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" +TIMEOUT_WDOG_FMT = "../${WDOG_TMPL}:${TIMEOUT_TGTFMT}.wants/${WDOG_INSTFMT}" + +# Capture debug information on watchdog timeout +DEBUG_WD_TIMEOUT_TMPL = "openpower-debug-collector-watchdog-timeout@.service" +DEBUG_WD_TIMEOUT_INSTFMT = "openpower-debug-collector-watchdog-timeout@{0}.service" +DEBUG_WD_TIMEOUT_FMT = "../${DEBUG_WD_TIMEOUT_TMPL}:${TIMEOUT_TGTFMT}.wants/${DEBUG_WD_TIMEOUT_INSTFMT}" + +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_CHECKSTOP_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'TIMEOUT_WDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'DEBUG_WD_TIMEOUT_FMT', 'OBMC_HOST_INSTANCES')}" + +# Do not depend on phosphor-logging for native build +DEPENDS_remove_class-native = "phosphor-logging" + +# Do not depend on phosphor-logging for native SDK build +DEPENDS_remove_class-nativesdk = "phosphor-logging" + +# Provide a means to enable/disable install_error_yaml feature +PACKAGECONFIG ??= "install_error_yaml" +PACKAGECONFIG[install_error_yaml] = " \ + --enable-install_error_yaml, \ + --disable-install_error_yaml, ,\ + " + +# Enable install_error_yaml during native and native SDK build +PACKAGECONFIG_add_class-native = "install_error_yaml" +PACKAGECONFIG_add_class-nativesdk = "install_error_yaml" + +# Disable install_error_yaml during target build +PACKAGECONFIG_remove_class-target = "install_error_yaml" + +# Disable generating elog error header file during bitbake. Applications +# should be using the elog header generated by phosphor-logging recipe +EXTRA_OECONF += "--disable-gen_errors" + +BBCLASSEXTEND += "native nativesdk" -- cgit v1.2.3