diff options
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 5 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 72ef9b155..e33aa76d7 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -6,7 +6,8 @@ # - obmc-chassis-mgmt - OpenBMC chassis management # - obmc-chassis-state-mgmt - OpenBMC chassis state management # - obmc-event-mgmt - OpenBMC event management -# - obmc-fan-mgmt - OpenBMC fan management +# - obmc-fan-control - OpenBMC fan management +# - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead # - obmc-flash-mgmt - OpenBMC flash management # - obmc-host-ctl - OpenBMC host control # - obmc-host-ipmi - OpenBMC host IPMI @@ -32,6 +33,7 @@ FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt" FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt')}" FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "packagegroup-obmc-apps-chassis-state-mgmt" FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt')}" +FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control" FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt')}" FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt')}" FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled(d, 'obmc-host-ctl', 'virtual-obmc-host-ctl')}" @@ -53,6 +55,7 @@ IMAGE_FEATURES += " \ obmc-chassis-mgmt \ obmc-chassis-state-mgmt \ obmc-event-mgmt \ + obmc-fan-control \ obmc-fan-mgmt \ obmc-flash-mgmt \ obmc-host-ctl \ diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 11de82f02..3dcba8a86 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -11,6 +11,7 @@ PACKAGES = " \ ${PN}-chassis-state-mgmt \ ${PN}-extras \ ${PN}-extrasdev \ + ${PN}-fan-control \ ${PN}-host-state-mgmt \ ${PN}-inventory \ ${PN}-leds \ @@ -38,6 +39,14 @@ RDEPENDS_${PN}-extrasdev = " \ rest-dbus \ " +# Use the fan control package group for applications +# implementing fan control or system fan policy only. +# Applications that create inventory or sensors should +# be added those respective package groups instead. +SUMMARY_${PN}-fan-control = "Fan control" +RDEPENDS_${PN}-fan-control = " \ + " + SUMMARY_${PN}-host-state-mgmt = "Host state management" RDEPENDS_${PN}-host-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-host-state-manager} \ |