From c1371fdf473e2f24d44a36c7d8eb855eb917cd1f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 18 Aug 2020 19:30:11 -0400 Subject: meta-phosphor: fru-device: add package Add a fru-device package, packagegroup, and image feature. Remove the ipmi-fru distro feature, since adding it in the first place was a mistake - no projects have conditional ipmi-fru feature flags. (From meta-phosphor rev: 4525a9d01a5f65438342a894f27c82f0dd61642c) Change-Id: I6928ac67d4acb4568359a308b45cb0734d116054 Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-phosphor/classes') diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index f34b1a630..d68fa37e3 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-fru-ipmi - OpenBMC IPMI FRU EEPROM support # - obmc-health-monitor - OpenBMC health monitoring # - obmc-host-ctl - OpenBMC host control # - obmc-host-ipmi - OpenBMC host IPMI @@ -42,6 +43,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-fru-ipmi ?= "packagegroup-obmc-apps-fru-ipmi" 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)}" -- cgit v1.2.3