diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-23 00:18:53 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-04 13:38:19 +0000 |
| commit | 211ccf33fb57ddede03d26cf7cb05924d039b2df (patch) | |
| tree | dd48d4379798885ff51310d02e609e6dd1ec8b19 /meta-phosphor/classes | |
| parent | 2f2163c1d6e4f6d0e004709e21f51ad20ee72ee4 (diff) | |
| download | talos-openbmc-211ccf33fb57ddede03d26cf7cb05924d039b2df.tar.gz talos-openbmc-211ccf33fb57ddede03d26cf7cb05924d039b2df.zip | |
Remove ipmi distro feature, virtual
We don't need a distro feature for net IPMI at this point, so
simplify things a bit.
Additionally, remove the net-ipmi virtual since we don't have
any alternative implementations today and it just adds unnecessary
complexity.
Tested: Built a witherspoon image and validated manifest
Change-Id: I2784f13b3e8897e855ac128422081ec3ee207bf1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index ab72debf9..a4aaeae7f 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -37,7 +37,7 @@ FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-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', 'packagegroup-obmc-apps-logging')}" -FEATURE_PACKAGES_obmc-net-ipmi ?= "${@df_enabled(d, 'obmc-net-ipmi', 'virtual-obmc-net-ipmi')}" +FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt')}" @@ -46,6 +46,11 @@ FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" FEATURE_PACKAGES_obmc-user-mgmt ?= "packagegroup-obmc-apps-user-mgmt" +# FIXME: phosphor-net-ipmi depends on phosphor-ipmi-host !?!? and +# cannot be built on core-qemu machines because of the dependency +# tree under phosphor-ipmi-host +FEATURE_PACKAGES_obmc-net-ipmi_qemuall = "" + # Install entire Phosphor application stack by default IMAGE_FEATURES += " \ obmc-bmc-state-mgmt \ |
