diff options
5 files changed, 15 insertions, 10 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend new file mode 100644 index 000000000..07bb5f247 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}-libs += "host-ipmid-oem" 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 314fdd484..13fa14a97 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -7,10 +7,6 @@ OBMC_MACHINE_FEATURES += "\ openpower-pflash \ " -VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ - host-ipmid-oem \ - host-ipmid-fru \ - " VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "btbridged" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index ff7f562c6..f71f79ad0 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -5,7 +5,7 @@ PR = "r1" RRECOMMENDS_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers}" +RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs" inherit autotools pkgconfig inherit obmc-phosphor-license diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb new file mode 100644 index 000000000..a534363a5 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb @@ -0,0 +1,13 @@ +SUMMARY = "OpenBMC - IPMI providers" +PR = "r1" + +inherit packagegroup +inherit obmc-phosphor-license + +PROVIDES = "${PACKAGES}" +PACKAGES = "${PN}-libs" + +SUMMARY_${PN}-libs = "Extra providers for ipmid." +RDEPENDS_${PN}-libs = " \ + host-ipmid-fru \ + " diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc index 91c1d66db..cd41c7220 100644 --- a/meta-phosphor/conf/machine/include/sample.inc +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -5,11 +5,6 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-flash-mgmt \ " -VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ - host-ipmid-oem \ - host-ipmid-fru \ - host-ipmid-tool \ - " PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "host-ipmi-hw-example" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "obmc-phosphor-chassisd" PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event" |
