diff options
4 files changed, 6 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb index ada6d1182..58e73b550 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb @@ -22,6 +22,7 @@ RDEPENDS_${PN} += " \ phosphor-dbus-interfaces \ phosphor-logging \ sdbusplus \ + virtual-obmc-image-manager \ " S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index 78955f7cb..6a6ba05ee 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -48,6 +48,11 @@ RDEPENDS_${PN}-updater += " \ phosphor-logging \ phosphor-dbus-interfaces \ sdbusplus \ + virtual-obmc-image-manager \ +" + +RPROVIDES_${PN}-version += " \ + virtual-obmc-image-manager \ " FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager" diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 035270e48..2d2b7e1a8 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -85,7 +85,6 @@ RDEPENDS_${PN}-sensors = " \ SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ - ${VIRTUAL-RUNTIME_obmc-bmc-code-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ " diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 543413cd8..5a5fe3ab7 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -77,12 +77,6 @@ VIRTUAL-RUNTIME_obmc-led-monitor ?= "phosphor-led-manager-faultmonitor" # Linux kernel LED subsystem LEDs. VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs" -# obmc-bmc-code-mgr -# -# Provides an implementation of the xyz.openbmc_project.Software.Version -# interface. -VIRTUAL-RUNTIME_obmc-bmc-code-mgr ?= "phosphor-software-manager-version" - # obmc-bmc-download-mgr # # Provides an implementation of the xyz.openbmc_project.Common.TFTP |