From 4f12f72793d2fecd7403d4c2aa117af6c40d7f9b Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 1 Feb 2017 21:04:14 -0500 Subject: Add inventory, led and sensors package groups Add inventory, leds and sensors categories to the obmc-apps packagegroup. Add virtuals and mark Phosphor apps as providers: -obmc-inventory-manager -obmc-leds-manager -obmc-leds-sysfs -obmc-sensors-hwmon Add legacy applications to these groups in the OpenPOWER later until they are fully deprecated. Change-Id: If3ae7c83ccd03e21adbca4653c1e803566b502de Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meta-phosphor/classes/obmc-phosphor-image.bbclass') diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index cd322bb31..b22d55f04 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -11,8 +11,11 @@ # - obmc-host-ctl - OpenBMC host control # - obmc-host-ipmi - OpenBMC host IPMI # - obmc-host-state-mgmt - OpenBMC host state management +# - obmc-inventory - OpenBMC inventory support +# - obmc-leds - OpenBMC LED support # - obmc-logging-mgmt - OpenBMC logging management # - obmc-sensor-mgmt - OpenBMC sensor management +# - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-system-mgmt - OpenBMC system management # - obmc-user-mgmt - OpenBMC user management @@ -30,9 +33,12 @@ FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-flash-mgmt' FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled(d, 'obmc-host-ctl', 'virtual-obmc-host-ctl')}" FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled(d, 'obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw')}" FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled(d, 'obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt')}" +FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory" +FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds" FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'virtual-obmc-logging-mgmt')}" FEATURE_PACKAGES_obmc-net-ipmi ?= "${@df_enabled(d, 'obmc-net-ipmi', 'virtual-obmc-net-ipmi')}" FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt')}" +FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled(d, 'obmc-settings-mgmt', 'virtual-obmc-settings-mgmt')}" FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt')}" FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt')}" @@ -48,9 +54,12 @@ IMAGE_FEATURES += " \ obmc-host-ctl \ obmc-host-ipmi \ obmc-host-state-mgmt \ + obmc-inventory \ + obmc-leds \ obmc-logging-mgmt \ obmc-net-ipmi \ obmc-sensor-mgmt \ + obmc-sensors \ obmc-settings-mgmt \ obmc-system-mgmt \ obmc-user-mgmt \ -- cgit v1.2.3