phosphor-software-manager: make version a virtual pkg
phosphor-software-manager-version provides a set of dbus
interfaces that are only useful if there is an 'updater'
package also installed. Rather than explicitly install
phosphor-software-manager-version, have it RPROVIDE a
virtual package and set up RDEPENDS correctly so it is
added to the image whenever an 'updater' package is
installed.
Change-Id: Id6850aca023bb546881fe1583c57d9a24405e25a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index 78955f7..6a6ba05 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -48,6 +48,11 @@
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/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 035270e..2d2b7e1 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -85,7 +85,6 @@
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/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 543413c..5a5fe3a 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -77,12 +77,6 @@
# 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