From e9defc0d3e666b934bbcae70ab09f15d782963c1 Mon Sep 17 00:00:00 2001 From: "Wludzik, Jozef" Date: Thu, 28 Jan 2021 09:36:34 +0100 Subject: meta-phosphor: obmc-apps: Add telemetry Added telemetry package to obmc package groups. Added telemetry to image features for easy opt-out. Change-Id: I66be3a545a1ce1cfb2c2c241629168c5b8d56c0d Signed-off-by: Wludzik, Jozef --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 4 +++- meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 1 + .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 7a213e513..0a07fc6f4 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -8,6 +8,7 @@ # - obmc-chassis-state-mgmt - OpenBMC chassis state management # - obmc-console - OpenBMC serial over LAN # - obmc-dbus-monitor - OpenBMC dbus monitoring +# - obmc-debug-collector - OpenBMC debug collector # - obmc-devtools - OpenBMC development and debugging tools # - obmc-fan-control - OpenBMC fan management # - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead @@ -27,9 +28,9 @@ # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management # - obmc-system-mgmt - OpenBMC system management +# - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users -# - obmc-debug-collector - OpenBMC debug collector inherit core-image inherit obmc-phosphor-utils @@ -62,6 +63,7 @@ FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'o FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" +FEATURE_PACKAGES_obmc-telemetry ?= "packagegroup-obmc-apps-telemetry" FEATURE_PACKAGES_obmc-user-mgmt ?= "packagegroup-obmc-apps-user-mgmt" FEATURE_PACKAGES_obmc-user-mgmt-ldap ?= "packagegroup-obmc-apps-user-mgmt-ldap" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 76515fae0..e4f955f6e 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -38,6 +38,7 @@ IMAGE_FEATURES += " \ obmc-debug-collector \ obmc-network-mgmt \ obmc-settings-mgmt \ + obmc-telemetry \ " LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index e080ff635..bff21e53c 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -28,6 +28,7 @@ PACKAGES = " \ ${PN}-debug-collector \ ${PN}-settings \ ${PN}-network \ + ${PN}-telemetry \ ${PN}-user-mgmt \ ${PN}-user-mgmt-ldap \ " @@ -175,6 +176,11 @@ RDEPENDS_${PN}-network = " \ ${VIRTUAL-RUNTIME_obmc-network-manager} \ " +SUMMARY_${PN}-telemetry = "Telemetry solution" +RDEPENDS_${PN}-telemetry = " \ + telemetry \ + " + SUMMARY_${PN}-user-mgmt = "User management applications" RDEPENDS_${PN}-user-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-user-mgmt} \ -- cgit v1.2.3