diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
commit | ae908254d22318b9e27acf6e5e28d1a4ab5e2195 (patch) | |
tree | 0d057ad30ca7f77c7c299762d60929e34ff51ab5 /meta-phosphor/recipes-phosphor/dump | |
parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
parent | 66d661a7f7784d58c8a437f1cdeb0c0ab03f0364 (diff) | |
download | openbmc-ae908254d22318b9e27acf6e5e28d1a4ab5e2195.tar.xz |
Merge tag '0.70' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/dump')
3 files changed, 17 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 784e57cdc..5c30040bf 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "6341919fc147335ce64d838435d4a7b9bc625f62" +SRCREV = "0eadeb7e78ea549da1c40016c9dc43f52df8b70d" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service new file mode 100644 index 000000000..efb95c39e --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service @@ -0,0 +1,13 @@ +[Unit] +Description=Ramoops monitor. +ConditionPathExists=/var/lib/systemd/pstore +After=xyz.openbmc_project.Dump.Manager.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/phosphor-ramoops-monitor +SyslogIdentifier=ramoops-monitor + +[Install] +WantedBy=multi-user.target + diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 374d32a07..41b2370e3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -38,6 +38,7 @@ DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ + fmt \ " RDEPENDS_${PN}-manager += " \ @@ -63,11 +64,13 @@ FILES_${PN}-manager += " \ ${datadir}/dump/ \ " FILES_${PN}-monitor += "${bindir}/phosphor-dump-monitor" +FILES_${PN}-monitor += "${bindir}/phosphor-ramoops-monitor" FILES_${PN}-dreport += "${bindir}/dreport" FILES_${PN}-scripts += "${dreport_dir}" DBUS_SERVICE_${PN}-manager += "${MGR_SVC}" SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service" +SYSTEMD_SERVICE_${PN}-monitor += "ramoops-monitor.service" EXTRA_OEMESON = " \ -DBMC_DUMP_PATH=${bmc_dump_path} \ |