diff options
| author | Marri Devender Rao <devenrao@in.ibm.com> | 2018-11-21 15:30:36 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-23 18:36:10 +0300 |
| commit | 5035fcf95767a51c7ff3f72bfd75813458099129 (patch) | |
| tree | e996d91f30492f84a2c5a8ff3fc080958f3a531f | |
| parent | 39803765763df44c3e6fd456d652cb21bae3c628 (diff) | |
| download | openbmc-5035fcf95767a51c7ff3f72bfd75813458099129.tar.xz | |
phosphor-debug-collector: Phosphor Pass errors to watch through YAML file
Refactored code to pass error objects to watch through YAML file
Dump will be created when an error object created matches
the error object path specified in the YAML file.
(From meta-phosphor rev: ae622549f4947084e549ec5cfc40f88daa5c4ae6)
Change-Id: I9eb1c53ee4e1580d903e1004009d7595fb7811a6
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 31 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 3ac005b88..3fd6f0ba0 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -35,6 +35,7 @@ DEPENDS += " \ sdbusplus \ sdbusplus-native \ autoconf-archive-native \ + virtual/phosphor-debug-errors \ " RDEPENDS_${PN}-manager += " \ @@ -62,7 +63,11 @@ MGR_SVC ?= "xyz.openbmc_project.Dump.Manager.service" SYSTEMD_SUBSTITUTIONS += "BMC_DUMP_PATH:${bmc_dump_path}:${MGR_SVC}" -FILES_${PN}-manager += "${sbindir}/phosphor-dump-manager ${exec_prefix}/lib/tmpfiles.d/coretemp.conf" +FILES_${PN}-manager += " \ + ${sbindir}/phosphor-dump-manager \ + ${exec_prefix}/lib/tmpfiles.d/coretemp.conf \ + ${datadir}/dump/ \ + " FILES_${PN}-monitor += "${sbindir}/phosphor-dump-monitor" FILES_${PN}-dreport += "${bindir}/dreport" FILES_${PN}-scripts += "${dreport_dir}" @@ -70,7 +75,10 @@ FILES_${PN}-scripts += "${dreport_dir}" DBUS_SERVICE_${PN}-manager += "${MGR_SVC}" SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service" -EXTRA_OECONF = "BMC_DUMP_PATH=${bmc_dump_path}" +EXTRA_OECONF = " \ + BMC_DUMP_PATH=${bmc_dump_path} \ + ERROR_MAP_YAML=${STAGING_DIR_NATIVE}/${datadir}/dump/errors_watch.yaml \ + " S = "${WORKDIR}/git" SRC_URI += "file://coretemp.conf" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb new file mode 100644 index 000000000..7a6870c5d --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Debug collector error watch config file" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native + +SRC_URI += "file://errors_watch.yaml" + +PROVIDES += "virtual/phosphor-debug-errors" + +S = "${WORKDIR}" + +do_install_append() { + DEST=${D}${datadir}/dump + install -d ${DEST} + install errors_watch.yaml ${DEST}/ +} + diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors/errors_watch.yaml b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors/errors_watch.yaml new file mode 100644 index 000000000..cb38153e1 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors/errors_watch.yaml @@ -0,0 +1,2 @@ +elog: + - xyz.openbmc_project.Common.Error.InternalFailure |