summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon
diff options
context:
space:
mode:
authorAndrew Geissler <openbmcbump-github@yahoo.com>2019-10-14 17:00:23 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-17 15:17:24 +0300
commitf3b54df0bb4a9cd9148d2deaec2e3d927724a9ad (patch)
treed349580c8714ebf7d1ef911e18257cd2a829288c /meta-ibm/meta-witherspoon
parentbb92713304736a7dc5d392faf2e0a6487d2e6e0e (diff)
downloadopenbmc-f3b54df0bb4a9cd9148d2deaec2e3d927724a9ad.tar.xz
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>
Diffstat (limited to 'meta-ibm/meta-witherspoon')
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb1
2 files changed, 2 insertions, 1 deletions
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 0612d62afd..668d837f5b 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 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power"
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 62bfbcec47..49fe344dc0 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 @@ DEPENDS += " \
sdbus++-native \
sdeventplus \
power-sequencer \
+ nlohmann-json \
"
EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"