From 98861c51c8f99cf4d7ae67ae559375b12142e27c Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 20 Feb 2018 12:19:56 -0800 Subject: minor reorganization of phosphor-defaults.inc This is a minor reorganization by grouping of the overrides specified in the phosphor-defaults.inc file. Change-Id: I1634552a286e0f0b04b4c0d3c7c07e4a0aa03c06 Signed-off-by: Patrick Venture --- .../conf/distro/include/phosphor-defaults.inc | 44 +++++++++++++--------- 1 file changed, 26 insertions(+), 18 deletions(-) (limited to 'meta-phosphor/conf') diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index f55c4f6b0..f654130f8 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -132,8 +132,12 @@ VIRTUAL-RUNTIME_obmc-settings-mgmt ?= "phosphor-settings-manager" # Provide support for managing network VIRTUAL-RUNTIME_obmc-network-manager ?= "network" -# virtual/phosphor-ipmi-fru-hostfw-config +# Configuration overrides for phosphor-ipmi-fru. # +# The phosphor-ipmi-fru application is data-driven and requires an input +# mapping of how the host firmware reports inventory via IPMI and the mapping +# of that inventory metadata to DBus objects interfaces and properties. + # The phosphor-ipmi-fru application is data-driven and requires an input # mapping of how the host firmware reports inventory via IPMI. # This virtual is a native recipe that provides that mapping by installing @@ -141,7 +145,6 @@ VIRTUAL-RUNTIME_obmc-network-manager ?= "network" # the phosphor-ipmi-fru build process. PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "phosphor-ipmi-fru-hostfw-config-example-native" - # The phosphor-ipmi-fru application is data-driven and requires an input # mapping of IPMI inventory metadata to DBus objects interfaces and properties. # This virtual is a native recipe that provides that mapping by installing @@ -153,17 +156,12 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory ?= \ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties ?= \ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-properties-mrw-native', 'phosphor-ipmi-fru-properties-native')}" - PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory ?= \ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-read-inventory-mrw-native', 'phosphor-ipmi-fru-read-inventory-example-native')}" -# The phosphor-led-manager application is data-driven and requires an input -# yaml of LED group and members. -# This virtual is a native recipe that provides that mapping by installing -# configuration files in the format and native sysroot location expected by -# the phosphor-led-manager build process in the native sysroot. -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-led-manager-config-mrw-native', 'phosphor-led-manager-config-example-native')}" +# Configuration overrides for phosphor-host-ipmid. +# +# The phosphor-host-ipmid application is data-driven. # The phosphor-host-ipmid application is data-driven and requires an input # mapping of IPMI inventory sensor metadata to DBus objects interfaces and properties. @@ -180,6 +178,24 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory ?= \ # the phosphor-host-ipmid build process in the native sysroot. PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config ?= "phosphor-ipmi-channel-inventory-native" +# The phosphor-host-ipmid application is data-driven and requires an input +# mapping of inventory object path to the sensor number and sensor metadata. +# This virtual is a native recipe that provides that mapping by installing +# configuration files in the format and native sysroot location expected by +# the phosphor-host-ipmid build process in the native sysroot. +PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel ?= \ + "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-inventory-sel-mrw-native', 'phosphor-ipmi-inventory-sel-native')}" + +# Various other overrides. + +# The phosphor-led-manager application is data-driven and requires an input +# yaml of LED group and members. +# This virtual is a native recipe that provides that mapping by installing +# configuration files in the format and native sysroot location expected by +# the phosphor-led-manager build process in the native sysroot. +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= \ + "${@cf_enabled(d, 'obmc-mrw', 'phosphor-led-manager-config-mrw-native', 'phosphor-led-manager-config-example-native')}" + # The phosphor-logging application has a data driven plugin that adds FRU # callout information to error logs, when applications generating error logs # add the requisite callout metadata to the systemd journal. The plugin requires @@ -206,14 +222,6 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config ?= \ PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config ?= \ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-fan-control-fan-config-mrw-native', 'phosphor-fan-control-fan-config-native')}" -# The phosphor-host-ipmid application is data-driven and requires an input -# mapping of inventory object path to the sensor number and sensor metadata. -# This virtual is a native recipe that provides that mapping by installing -# configuration files in the format and native sysroot location expected by -# the phosphor-host-ipmid build process in the native sysroot. -PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-inventory-sel-mrw-native', 'phosphor-ipmi-inventory-sel-native')}" - # The phosphor-gpio-monitor application is data-driven and requires an input. # The application then watches the passed in input event entry for the # change in polarity for the value matching user input. Once the required -- cgit v1.2.3