diff options
| author | Brandon Kim <brandonkim@google.com> | 2021-07-31 02:19:14 +0300 |
|---|---|---|
| committer | Brandon Kim <brandonkim@google.com> | 2021-08-02 19:23:11 +0300 |
| commit | cf4068273389ae8306fb70931bfd7c3f53602720 (patch) | |
| tree | 322c72a66fd094af7f72e0a0f9ff69b1f4e1db87 /meta-quanta | |
| parent | 5437c80f01609f62a62b887b5d3491dd7d5765a2 (diff) | |
| download | openbmc-cf4068273389ae8306fb70931bfd7c3f53602720.tar.xz | |
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
Diffstat (limited to 'meta-quanta')
3 files changed, 4 insertions, 3 deletions
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 90f98ad67..59973e80c 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -22,6 +22,7 @@ FLASH_SIZE = "65536" 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 a177586ca..da672001e 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 @@ PR = "r1" 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 @@ SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \ 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 a1b23973a..2ed0fb7e9 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 @@ OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" # 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" |