diff options
3 files changed, 15 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 4f12335f3..d4e8d2032 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -44,7 +44,7 @@ RDEPENDS_${PN}-fans = " \ SUMMARY_${PN}-flash = "OpenPOWER Flash" RDEPENDS_${PN}-flash = " \ - obmc-flash-bmc obmc-mgr-download obmc-control-bmc \ + obmc-control-bmc \ ${@mf_enabled(d, 'openpower-ubi-fs', \ 'openpower-software-manager', \ 'obmc-flash-bios obmc-mgr-download obmc-op-flasher')} \ 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 2f4b50d1c..f014f1751 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -93,7 +93,15 @@ SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ + ${VIRTUAL-RUNTIME_obmc-bmc-version} \ " +# Determine if the non-UBI flash packages are required +RDEPENDS_${PN}-software += " \ + ${@mf_enabled(d, 'obmc-ubi-fs', \ + '', \ + 'obmc-flash-bmc obmc-mgr-download')} \ + " + SUMMARY_${PN}-debug-collector = "BMC debug collector" RDEPENDS_${PN}-debug-collector = " \ ${VIRTUAL-RUNTIME_obmc-dump-manager} \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 5387f93d8..3158c8f74 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -83,6 +83,12 @@ VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs" # interface. VIRTUAL-RUNTIME_obmc-bmc-download-mgr ?= "phosphor-software-manager-download-mgr" +# obmc-bmc-version +# +# Provides an implementation of the xyz.openbmc_project.Software.Version +# interface. +VIRTUAL-RUNTIME_obmc-bmc-version ?= "phosphor-software-manager-version" + # obmc-bmc-updater # # Provides an implementation of the xyz.openbmc_project.Software.Activation |