diff options
5 files changed, 6 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index 13fa14a97..8862688a0 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -4,6 +4,7 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-sensor-mgmt \ obmc-phosphor-flash-mgmt \ obmc-phosphor-event-mgmt \ + obmc-host-ipmi \ openpower-pflash \ " diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index c5d14a8b8..9dac71bc6 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -9,6 +9,7 @@ # - obmc-phosphor-event-mgmt - Phosphor OpenBMC event management # - obmc-phosphor-user-mgmt - Phosphor OpenBMC user management # - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management +# - obmc-host-ipmi - OpenBMC Host IPMI inherit core-image inherit obmc-phosphor-license @@ -21,6 +22,7 @@ FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', ' FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled('obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt', d)}" FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}" FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}" +FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}" # Install entire Phosphor application stack by default IMAGE_FEATURES += " \ @@ -31,6 +33,7 @@ IMAGE_FEATURES += " \ obmc-event-mgmt \ obmc-user-mgmt \ obmc-system-mgmt \ + obmc-host-ipmi \ ssh-server-dropbear \ " diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bb index 6770ad071..49eecdddc 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bb @@ -14,7 +14,6 @@ PACKAGES = " \ SUMMARY_${PN}-extras = "Extra features" RDEPENDS_${PN}-extras = " \ phosphor-rest \ - host-ipmid \ " SUMMARY_${PN}-extrasdev = "Development features" diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 0c432b60a..c890d36ce 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -27,6 +27,7 @@ DISTRO_FEATURES = "\ obmc-phosphor-event-mgmt \ obmc-phosphor-user-mgmt \ obmc-phosphor-system-mgmt \ + obmc-host-ipmi \ ${DISTRO_FEATURES_LIBC} \ " diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc index cd41c7220..cdf10dec8 100644 --- a/meta-phosphor/conf/machine/include/sample.inc +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -3,6 +3,7 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-sensor-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-host-ipmi \ " PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "host-ipmi-hw-example" |
