diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor/logging')
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 23 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend | 1 |
2 files changed, 7 insertions, 17 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 diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5c1d740ba..ac5e0b969 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,3 +1,2 @@ -PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" PACKAGECONFIG_append_rainier = " openpower-pels" |