diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-23 20:07:46 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-04 16:38:06 +0300 |
| commit | eca8d7cffc6437ca45ca33518b9e259ad2ef061f (patch) | |
| tree | 914b20ac26dbc654c0cf038bec8bbed753d682ad | |
| parent | ccd94f68226da82f6a677b551d75fefb7895bc37 (diff) | |
| download | openbmc-eca8d7cffc6437ca45ca33518b9e259ad2ef061f.tar.xz | |
logging: virtual refactoring
Remove the phosphor-logging virtuals. They were unused.
Add a logging packagegroup so other layers can add additional
logging applications predicated on the logging distro feature
being enabled.
Change-Id: Ic82843cb2b1229df55005bad93576c14f468073b
Tested: Built witherspoon, palmetto and qemu images
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
4 files changed, 7 insertions, 4 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 1a5161425..ab72debf9 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -36,7 +36,7 @@ FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled(d, 'obmc-host-ipmi', 'virtual- FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt" FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory" FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds" -FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'virtual-obmc-logging-mgmt')}" +FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'packagegroup-obmc-apps-logging')}" FEATURE_PACKAGES_obmc-net-ipmi ?= "${@df_enabled(d, 'obmc-net-ipmi', 'virtual-obmc-net-ipmi')}" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb index ff63dcf27..9cc9a6451 100644 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb +++ b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb @@ -24,8 +24,6 @@ DEPENDS += "phosphor-logging-error-logs-native" DEPENDS += "phosphor-logging-native" DEPENDS += "cereal" RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" -PROVIDES += "virtual/obmc-logging-mgmt" -RPROVIDES_${PN} += "virtual-obmc-logging-mgmt" PACKAGE_BEFORE_PN = "${PN}-test" FILES_${PN}-test = "${bindir}/*-test" 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 e7fe3708a..2199e0389 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -15,6 +15,7 @@ PACKAGES = " \ ${PN}-host-state-mgmt \ ${PN}-inventory \ ${PN}-leds \ + ${PN}-logging \ ${PN}-sensors \ ${PN}-software \ ${PN}-host-check-mgmt \ @@ -78,6 +79,11 @@ RDEPENDS_${PN}-leds = " \ ${VIRTUAL-RUNTIME_obmc-led-monitor} \ " +SUMMARY_${PN}-logging = "Logging applications" +RDEPENDS_${PN}-logging = " \ + phosphor-logging \ + " + SUMMARY_${PN}-sensors = "Sensor applications" RDEPENDS_${PN}-sensors = " \ ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 047e88e7a..82d947392 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -88,7 +88,6 @@ VIRTUAL-RUNTIME_obmc-bmc-version ?= "phosphor-software-manager-version" # interface. VIRTUAL-RUNTIME_obmc-bmc-updater ?= "phosphor-software-manager-updater" -PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging" PREFERRED_PROVIDER_virtual/obmc-net-ipmi ?= "phosphor-ipmi-net" # obmc-sensors-hwmon |