From 44ee749d75848f0babb6ceb225c34c8fa2dd381a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 26 Jan 2017 11:26:04 -0500 Subject: Clean up op packagegroups Now that the legacy applications are picked up in the OpenPOWER layer via obmc-apps packagegroups, those dependencies can be removed from the op-apps packagegroup. Remove the sensord application as it has been replaced with phosphor-hwmon. Demote sensor mgmt feature to an image feature since anything running OpenBMC can have a sensor. Change-Id: I0b27cacbcbd73d53ab8db40790ea967ad478d111 Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 3 --- 1 file changed, 3 deletions(-) (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 b22d55f04..2b41fd5a2 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -14,7 +14,6 @@ # - 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 @@ -37,7 +36,6 @@ 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')}" @@ -58,7 +56,6 @@ IMAGE_FEATURES += " \ obmc-leds \ obmc-logging-mgmt \ obmc-net-ipmi \ - obmc-sensor-mgmt \ obmc-sensors \ obmc-settings-mgmt \ obmc-system-mgmt \ -- cgit v1.2.3