diff options
| author | Vijay Khemka <vijaykhemka@fb.com> | 2020-09-08 21:56:19 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-09-10 00:49:53 +0300 |
| commit | d549deec244e067a008fa6b66d945ddeb26c9608 (patch) | |
| tree | f0f6dcdd6536d73dd93840dcc712900e5ec901d1 | |
| parent | c7d1cd9477b2f14e48524da420e1528f6036c8b6 (diff) | |
| download | openbmc-d549deec244e067a008fa6b66d945ddeb26c9608.tar.xz | |
meta-phosphor: obmc-apps: Add health monitoring
Add phosphor-health-monitor packages to obmc packagroups and create
IMAGE_FEATURES for easy opt-out.
(From meta-phosphor rev: 67a3c577eced35685ec373b30a1419be5f3d3827)
Change-Id: I912610933a2e73530e862feff684134dce9dfe99
Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
3 files changed, 9 insertions, 0 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5961839cb..f34b1a630 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -12,6 +12,7 @@ # - obmc-fan-control - OpenBMC fan management # - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead # - obmc-flash-mgmt - OpenBMC flash management +# - obmc-health-monitor - OpenBMC health monitoring # - obmc-host-ctl - OpenBMC host control # - obmc-host-ipmi - OpenBMC host IPMI # - obmc-host-state-mgmt - OpenBMC host state management @@ -41,6 +42,7 @@ FEATURE_PACKAGES_obmc-devtools ?= "packagegroup-obmc-apps-devtools" FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control" FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', '', d)}" FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', '', d)}" +FEATURE_PACKAGES_obmc-health-monitor ?= "packagegroup-obmc-apps-health-monitor" FEATURE_PACKAGES_obmc-host-ctl ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-host-ctl', 'virtual-obmc-host-ctl', '', d)}" FEATURE_PACKAGES_obmc-host-ipmi ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', '', d)}" FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index c7512ed6a..ea87fb1f8 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -15,6 +15,7 @@ IMAGE_FEATURES += " \ obmc-fan-control \ obmc-fan-mgmt \ obmc-flash-mgmt \ + obmc-health-monitor \ obmc-host-ctl \ obmc-host-ipmi \ obmc-host-state-mgmt \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index deeae7901..78949f7a4 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -13,6 +13,7 @@ PACKAGES = " \ ${PN}-extras \ ${PN}-devtools \ ${PN}-fan-control \ + ${PN}-health-monitor \ ${PN}-host-state-mgmt \ ${PN}-ikvm \ ${PN}-inventory \ @@ -82,6 +83,11 @@ RDEPENDS_${PN}-fan-control = " \ phosphor-fan-monitor \ " +SUMMARY_${PN}-health-monitor = "Support for health monitoring" +RDEPENDS_${PN}-health-monitor = " \ + phosphor-health-monitor \ + " + SUMMARY_${PN}-host-state-mgmt = "Host state management" RDEPENDS_${PN}-host-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-host-state-manager} \ |