diff options
Diffstat (limited to 'meta-openpower')
-rw-r--r-- | meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard | 18 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend | 14 |
2 files changed, 8 insertions, 24 deletions
diff --git a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard deleted file mode 100644 index cdd461fec9..0000000000 --- a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# config: 2 40 -# @brief: Collect GUARD record information. -# - -. $DREPORT_INCLUDE/functions - -desc="GUARD Records" -file_name="/var/lib/phosphor-software-manager/pnor/prsv/GUARD" - -# Check file is present and not empty. -if [ ! -s "$file_name" ]; then - log_info "No $desc" - exit 0 -fi - -add_copy_file "$file_name" "$desc" diff --git a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 00b9eadfc6..3f505c3f67 100644 --- a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -1,15 +1,17 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://plugins.d/guard" install_openpower_plugins() { - install -m 0755 ${WORKDIR}/plugins.d/guard ${D}${dreport_plugin_dir} + install ${S}/tools/dreport.d/openpower.d/plugins.d/* ${D}${dreport_plugin_dir} } -#Link in the plugins so dreport run them at the appropriate time +#Link the plugins so that dreport can run them based on dump type python link_openpower_plugins() { - workdir = d.getVar('WORKDIR', True) - script = os.path.join(workdir, 'plugins.d', 'guard') - install_dreport_user_script(script, d) + source = d.getVar('S', True) + source_path = os.path.join(source, "tools", "dreport.d", "openpower.d", "plugins.d") + op_plugins = os.listdir(source_path) + for op_plugin in op_plugins: + op_plugin_name = os.path.join(source_path, op_plugin) + install_dreport_user_script(op_plugin_name, d) } DEBUG_COLLECTOR_INSTALL_POSTFUNCS ?= "" |