commit f26fd90b0b6fe9f39704d3aa2ba7c572ecde9fda
author Andrew Geissler <openbmcbump-github@yahoo.com> Mon Sep 23 19:11:20 2019 +0000
committer Brad Bishop <radsquirrel@gmail.com> Wed Sep 25 11:54:43 2019 +0000
tree 0a9d784b578d847dbff6a544696e9cfcd057cefe
parent 8264820ab49f665ea8e7965b6c45dedadd285024

phosphor-state-manager: srcrev bump 27115aec88..874051c8f7

Andrew Geissler (8):
      sysd_monitor: Initial application framework
      sysd_monitor: Parse command line parameters
      sysd_monitor: Create default monitoring json
      sysd_monitor: Parse json file(s)
      sysd_monitor: Handle default for errors to monitor
      sysd_monitor: Monitor and log errors
      sysd_monitor: Add systemd unit and required json
      Ignore code coverage files

Add in appropriate dependencies to build the above commits.
A separate commit will enable the new feature.

Change-Id: I51abfc40db702d0ef4b5f4c1cc64b6b8df58e90a
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>

recipes-phosphor/state/phosphor-state-manager_git.bb

diff --git a/recipes-phosphor/state/phosphor-state-manager_git.bb b/recipes-phosphor/state/phosphor-state-manager_git.bb
index 7aba095..43ffa8c 100644
--- a/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -15,6 +15,7 @@
     ${PN}-discover \
     ${PN}-host-check \
     ${PN}-reset-sensor-states \
+    ${PN}-systemd-target-monitor \
 "
 PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}"
 ALLOW_EMPTY_${PN} = "1"
@@ -23,6 +24,7 @@
 
 SYSTEMD_PACKAGES = "${PN}-discover \
                     ${PN}-reset-sensor-states \
+                    ${PN}-systemd-target-monitor \
 "
 
 # The host-check function will check if the host is running
@@ -42,6 +44,8 @@
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "libcereal"
+DEPENDS += "nlohmann-json"
+DEPENDS += "cli11"
 
 FILES_${PN}-host = "${bindir}/phosphor-host-state-manager"
 DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service"
@@ -66,6 +70,12 @@
 
 SYSTEMD_SERVICE_${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service"
 
+FILES_${PN}-systemd-target-monitor = " \
+    ${bindir}/phosphor-systemd-target-monitor \
+    ${sysconfdir}/phosphor-systemd-target-monitor/phosphor-target-monitor-default.json \
+    "
+SYSTEMD_SERVICE_${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service"
+
 RESET_CHECK_TMPL = "phosphor-reset-host-check@.service"
 RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target"
 RESET_CHECK_INSTFMT = "phosphor-reset-host-check@{0}.service"
@@ -131,7 +141,12 @@
 HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}"
 SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}"
 
+do_install_append() {
+  install -d ${D}${sysconfdir}/phosphor-systemd-target-monitor
+  install ${S}/phosphor-target-monitor-default.json ${D}${sysconfdir}/phosphor-systemd-target-monitor/phosphor-target-monitor-default.json
+}
+
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "27115aec886d69def59d18be7534d1156a9712ce"
+SRCREV = "874051c8f7fcdba499380beb6d232e6d80e52658"
 
 S = "${WORKDIR}/git"