summaryrefslogtreecommitdiff
path: root/meta-fii
diff options
context:
space:
mode:
authorMustafa Shehabi <mustafa.shehabi@fii-na.com>2021-08-26 19:22:46 +0300
committerVivekanand Veeracholan <vveerach@google.com>2021-08-26 22:14:24 +0300
commit4010b172c9086c4c5ef9261321de6213ac2d8871 (patch)
tree393039b849acce43b7c2c812aa5e7fad45d155b9 /meta-fii
parenta971fc37aca6a5c6ae1b4dec0ad5df2696c0b5b1 (diff)
downloadopenbmc-4010b172c9086c4c5ef9261321de6213ac2d8871.tar.xz
meta-fii/meta-kudo: Modify kudo.conf to use kudo bmc-update
Add PREFERRED_PROVIDER_virtual/bmc-update in kudo.conf to fix bmc_update build conflict with gbmc's bmc_update. Signed-off-by: Mustafa Shehabi <mustafa.shehabi@fii-na.com> Change-Id: Ideb5cbde0f4c94c7197984c1641223da1583111d
Diffstat (limited to 'meta-fii')
-rw-r--r--meta-fii/meta-kudo/conf/machine/kudo.conf1
-rw-r--r--meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf
index bcdbdfd2d..9f64c476b 100644
--- a/meta-fii/meta-kudo/conf/machine/kudo.conf
+++ b/meta-fii/meta-kudo/conf/machine/kudo.conf
@@ -34,6 +34,7 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps"
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif"
PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps"
PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps"
+PREFERRED_PROVIDER_virtual/bmc-update = "kudo-bmc-update"
PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps"
# Remove unneeded binaries from image
IMAGE_FEATURES:remove = "obmc-health-monitor"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
index 71daad346..0b7cfbee0 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
DEPENDS += "phosphor-ipmi-flash"
RDEPENDS:${PN} += "bash"
-
+RPROVIDES:${PN} += "virtual/bmc-update"
FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
SRC_URI:append:kudo = " \