diff options
author | Matt Spinler <spinler@us.ibm.com> | 2018-06-21 22:23:47 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-07-19 15:46:02 +0300 |
commit | b640b0ba83fdc076ba56b5ff98b96b3260b53607 (patch) | |
tree | e41d7545406ca6d0e1b770f8d236fa22ebc83bd4 /meta-phosphor/common/recipes-phosphor | |
parent | a48f7f6fc06351794f348633f2db4c105a437961 (diff) | |
download | openbmc-b640b0ba83fdc076ba56b5ff98b96b3260b53607.tar.xz |
Tell phosphor-logging about the sw-mgr error yaml
This needs to be done so phosphor-logging will know to grab
the error log's metadata from the journal and add it to
the log in the AdditionalData field.
Tested: Check that the errors now show up in the elog-lookup.cpp
file generated during the build by phosphor-logging.
Change-Id: I59e357986ac56ea752c9f7241a5138eb4985ceb6
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
4 files changed, 27 insertions, 6 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend new file mode 100644 index 000000000..beb70b0e6 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend @@ -0,0 +1 @@ +DEPENDS += "phosphor-software-manager-error-native" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb new file mode 100644 index 000000000..bf55058de --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Copy error yaml files to known path for elog parsing" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit phosphor-dbus-yaml + +require phosphor-software-manager.inc + +S = "${WORKDIR}/git" + +do_install_append() { + SRC=${S}/xyz/openbmc_project/Software/ + DEST=${D}${yaml_dir}/xyz/openbmc_project/Software/ + install -d ${DEST} + install ${SRC}/*.errors.yaml ${DEST} + install ${SRC}/*.metadata.yaml ${DEST} +} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index e23e8935f..55277066d 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -2,10 +2,9 @@ SUMMARY = "Phosphor Software Management" DESCRIPTION = "Phosphor Software Manager provides a set of system software \ management daemons. It is suitable for use on a wide variety of OpenBMC \ platforms." -HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +require ${PN}.inc SOFTWARE_MGR_PACKAGES = " \ ${PN}-version \ @@ -86,7 +85,4 @@ do_install_append() { fi } -SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "56aaf454adef04bd4c1d45870cd86dc2de0a880a" - S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc new file mode 100644 index 000000000..ef0bdf880 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc @@ -0,0 +1,5 @@ +HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" +SRCREV = "56aaf454adef04bd4c1d45870cd86dc2de0a880a" |