diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
| commit | 930df2e58b9725756edbccf99fd4979026fc28fd (patch) | |
| tree | 8c5fa9f20219e9bc4580bb18e03b8dd8043a9a4f /meta-phosphor/recipes-phosphor/logging | |
| parent | 7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c (diff) | |
| parent | 377d8f40e88eeb9ccb1321590a3af3c2caa94dda (diff) | |
| download | openbmc-930df2e58b9725756edbccf99fd4979026fc28fd.tar.xz | |
Merge tag '0.35' 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/ffdc_git.bb | 6 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 5c8f8aebc..f6ee824a8 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -3,8 +3,7 @@ DESCRIPTION = "Command line tool to collect and tar up debug data" PR = "r1" PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +require recipes-phosphor/dump/phosphor-debug-collector.inc DEPENDS += "systemd" @@ -13,9 +12,6 @@ RDEPENDS_${PN} += " \ " S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" - -SRCREV = "8b9b4690a4460ada5bf60a285ff6065eda6d5d4a" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 72beb6d17..3e0b84174 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f10068d397f4613b526394afbae245087caacb9d" +SRCREV = "e7d271ae7ecf460b9c4b76caf9ba555f7d8a532e" S = "${WORKDIR}/git" |