diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb')
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 9572df9b0..791ae9880 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "29c2ec6dd67df321662c906711ec95a4635b372f" +SRCREV = "aeaa374a6fa097b2359acfc4d694ed3ebe8eecaa" inherit autotools inherit pkgconfig @@ -16,10 +16,11 @@ inherit obmc-phosphor-systemd inherit phosphor-dbus-yaml DEPENDS += " \ - ibm-dbus-interfaces \ - phosphor-logging \ - nlohmann-json \ + ${PYTHON_PN}-pyyaml-native \ autoconf-archive-native \ + phosphor-dbus-interfaces \ + nlohmann-json \ + phosphor-logging \ sdbusplus \ " @@ -58,20 +59,10 @@ do_report(){ ${S}/create_error_reports.py \ -p ${D}/${datadir}/ibm-logging/policy.json \ - -y ${STAGING_DIR_NATIVE}${yaml_dir} \ + -y ${STAGING_DIR_TARGET}${yaml_dir} \ -e ${WORKDIR}/build/all_errors.json \ -x ${WORKDIR}/build/policy_crosscheck.txt } -addtask report - -#Collect all of the error YAML files into our recipe-sysroot-native dir. -do_report[depends] = " \ - ibm-logging:do_install \ - phosphor-logging-error-logs-native:do_populate_sysroot \ - phosphor-dbus-interfaces-native:do_populate_sysroot \ - openpower-dbus-interfaces-native:do_populate_sysroot \ - openpower-occ-control-native:do_populate_sysroot \ - openpower-debug-collector-native:do_populate_sysroot \ - " +addtask report after do_install |