diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-05 23:27:58 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-05 23:27:58 +0300 |
commit | ccd6cab15aedd223a42dfdb110ab2d71d8a87141 (patch) | |
tree | 2050b16c5978dbf1268ea0f1a65d15026ec25831 /meta-phosphor/recipes-phosphor/logging | |
parent | 6f65bb40d3e8b7fe978698488c2ea93f077bfcd6 (diff) | |
parent | 6dbb316ab9052d4dbf158377e1ffe36f205d5477 (diff) | |
download | openbmc-ccd6cab15aedd223a42dfdb110ab2d71d8a87141.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/logging')
-rw-r--r-- | meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 6728b0777..061124c09 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "31eed996da81cf6e35e7ddd035aa8088be230218" +SRCREV = "53407be367f112649cae10ebd6152f9bfd62b79b" S = "${WORKDIR}/git" @@ -95,7 +95,7 @@ PACKAGECONFIG[install_scripts] = " \ PACKAGECONFIG[openpower-pels] = " \ --enable-openpower-pel-extension, \ --disable-openpower-pel-extension, \ - nlohmann-json, \ + nlohmann-json cli11, \ , \ " |