| commit | f3b54df0bb4a9cd9148d2deaec2e3d927724a9ad | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <openbmcbump-github@yahoo.com> | Mon Oct 14 14:00:23 2019 +0000 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Oct 17 08:17:24 2019 -0400 |
| tree | d349580c8714ebf7d1ef911e18257cd2a829288c | |
| parent | bb92713304736a7dc5d392faf2e0a6487d2e6e0e [diff] |
phosphor-power: srcrev bump b3853e2d3a..7dc31bb1f7
Add nlohmann-json dependency to fix build failure.
George Liu (1):
Add an example JSON file based on power-supply
Lei YU (1):
Add loadJSONFromFile() in utility
(From meta-ibm rev: 78be06623cc1da4d36d9dbaf47323596d5389bf4)
Change-Id: I7c37738ed6638920c290548c2f3a3caaa1bdefb0
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index 0612d62..668d837 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
@@ -2,4 +2,4 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "b3853e2d3ac295a961e08927d177b40ddd683914" +SRCREV = "7dc31bb1f711927e80b900e256f8d413b2e71331"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index 62bfbce..49fe344 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
@@ -19,6 +19,7 @@ sdbus++-native \ sdeventplus \ power-sequencer \ + nlohmann-json \ " EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"