diff options
author | Josh King <jdking@us.ibm.com> | 2017-01-19 14:04:03 -0600 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-27 02:37:52 +0000 |
commit | d2b95c714b4b4aee453c860032815bcd345774e5 (patch) | |
tree | 97dc7a25af974121c04cfea4a51459648f5a293d /meta-phosphor/common | |
parent | 55f7f1810cfe8d63b92d3aa499469b772b30659b (diff) | |
download | talos-openbmc-d2b95c714b4b4aee453c860032815bcd345774e5.tar.gz talos-openbmc-d2b95c714b4b4aee453c860032815bcd345774e5.zip |
Incorporate new phosphor-bmc-state-manager into appropriate image
Change-Id: I4c013d98e03703b1328d85ae00cebb8500ffa205
Signed-off-by: Josh King <jdking@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service | 14 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service new file mode 100644 index 000000000..e3034e3e7 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service @@ -0,0 +1,14 @@ +[Unit] +Description=Phosphor BMC State Manager +Wants=mapper-wait@-org-openbmc-managers-System.service +After=mapper-wait@-org-openbmc-managers-System.service +Before=mapper-wait@-xyz-openbmc_project-state-bmc.service + +[Service] +ExecStart={sbindir}/phosphor-bmc-state-manager +Restart=always +Type=dbus +BusName={BUSNAME} + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb index 176c42b91..390ad49b2 100644 --- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" STATE_MGR_PACKAGES = " \ ${PN}-host \ ${PN}-chassis \ + ${PN}-bmc \ " PACKAGES =+ "${STATE_MGR_PACKAGES}" DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" @@ -27,6 +28,7 @@ DEPENDS += "phosphor-logging" RDEPENDS_${PN}-host += "libsystemd" RDEPENDS_${PN}-chassis += "libsystemd" +RDEPENDS_${PN}-bmc += "libsystemd" PROVIDES += "virtual/obmc-host-state-mgmt" RPROVIDES_${PN}-host += "virtual-obmc-host-state-mgmt" @@ -38,6 +40,11 @@ RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-state-mgmt" FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager" DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" +PROVIDES += "virtual/obmc-bmc-state-mgmt" +RPROVIDES_${PN}-bmc += "virtual-obmc-bmc-state-mgmt" +FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager" +DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" + SRC_URI += "git://github.com/openbmc/phosphor-state-manager" SRCREV = "d613b8166a3c3dc652badf8d8c52e74492941f28" |