meta-quanta: gbs: Move gbs-bmc-update to virtual provider
This is to avoid conflicts with inplace-gbmc-update that's defualt on
gBMC overrides.
Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: I8ccab5760dd8d4b0b5eb8de5cd270e756d5fa2aa
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 90f98ad..59973e8 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -22,6 +22,7 @@
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "gbs-led-manager-config-native"
PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update"
+PREFERRED_PROVIDER_virtual/bmc-update = "gbs-bmc-update"
# Remove unneeded binaries from image
IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
index a177586..da67200 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
@@ -2,11 +2,9 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
inherit systemd
inherit obmc-phosphor-systemd
-
SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \
file://bmc-verify.sh \
file://config-bmc.json \
@@ -14,6 +12,9 @@
FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
+PROVIDES += "virtual/bmc-update"
+RPROVIDES_${PN} += "virtual/bmc-update"
+
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-flash"
RDEPENDS_${PN} = "bash"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
index a1b2397..2ed0fb7 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -38,7 +38,6 @@
# Required for the front port. Part of obmc-console
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " obmc-console"
# Required from packagegroup-gbs-apps
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-bmc-update"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/bios-update"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " x86-power-control"
OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-pid-control"