diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-03-31 20:04:32 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-05-06 01:45:08 +0300 |
| commit | b3b5899fc47fdac6d3959051ebb223335909408a (patch) | |
| tree | b378775b802822d97a64fb5b9d360632767966b8 /meta-phosphor/common/recipes-phosphor/system | |
| parent | 176cadafcbc0dd6a69a58185b97db76ec68387fd (diff) | |
| download | openbmc-b3b5899fc47fdac6d3959051ebb223335909408a.tar.xz | |
Recipe for phosphor-discover-system-state
This recipe will add the new program phosphor-discover-system-state
to new builds. Additionally, the old Python state manager is
removed from the build since discover_system_state.py was the last
thing in it.
Resolves openbmc/openbmc#773
Change-Id: I99ba0f1f0264cedebc5a9a7e5fa5dbaba0b79502
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/system')
3 files changed, 0 insertions, 45 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state.bb deleted file mode 100644 index 464cf110a..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "OpenBMC state manager" -DESCRIPTION = "OpenBMC state manager." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-systemd - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-subprocess \ - python-pygobject \ - " - -SKELETON_DIR = "pystatemgr" -SYSTEMD_SERVICE_${PN} += "obmc-mgr-state.service obmc-mgr-state.target" - -TMPL = "mapper-wait@.service" -TGT = "obmc-mgr-state.target" -HOST_FMT = "../${TMPL}:${TGT}.wants/mapper-wait@-org-openbmc-settings-host{0}.service" -CHASSIS_FMT = "../${TMPL}:${TGT}.wants/mapper-wait@-org-openbmc-control-chassis{0}.service" -POWER_FMT = "../${TMPL}:${TGT}.wants/mapper-wait@-org-openbmc-control-power{0}.service" - -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT', 'OBMC_POWER_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service deleted file mode 100644 index 681abb4b3..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Restore Last State -Wants=obmc-mgr-state.target -After=obmc-mgr-state.target -Wants=mapper-wait@-org-openbmc-settings-host0.service -After=mapper-wait@-org-openbmc-settings-host0.service - -[Service] -Restart=no -Type=oneshot -ExecStart={sbindir}/discover_system_state.py -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target deleted file mode 100644 index fef2a1ff0..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Restore Last State |