From b81d4282120dc0c19e0f73833e12a9a5baa7a3a5 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 8 Mar 2018 22:29:25 -0500 Subject: Remove obmc-mrw machine feature Using MRW or not is distro policy. As such remove the obmc-mrw machine feature. Do not enable the remaining obmc-mrw distro feature in the base phosphor distro configuration. Create new distro configs for the systems that use MRW today (i.e. Witherspoon) that enables the obmc-mrw distro feature and point the local.conf.sample at the new distro configuration. Change-Id: If4cedc745b3ee942518fbfd4d5cf2cd5b60f346d Tested: Built a Witherspoon image and validate the manifest Signed-off-by: Brad Bishop --- .../conf/distro/include/phosphor-defaults.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'meta-phosphor/conf/distro/include/phosphor-defaults.inc') diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index f654130f8..53588af72 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -120,7 +120,7 @@ PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent" # The phosphor-hwmon package can have its configuration generated # automatically if the MRW feature is enabled. VIRTUAL-RUNTIME_phosphor-hwmon-config ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-hwmon-config-mrw')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-hwmon-config-mrw')}" # obmc-settings-mgmt # @@ -151,13 +151,13 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "phosphor-ipmi-fru # configuration files in the format and native sysroot location expected by # the phosphor-ipmi-fru build process in the native sysroot. PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-inventory-mrw-native', 'phosphor-ipmi-fru-inventory-example-native')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-inventory-mrw-native', 'phosphor-ipmi-fru-inventory-example-native')}" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-properties-mrw-native', 'phosphor-ipmi-fru-properties-native')}" + "${@df_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')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-read-inventory-mrw-native', 'phosphor-ipmi-fru-read-inventory-example-native')}" # Configuration overrides for phosphor-host-ipmid. # @@ -169,7 +169,7 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory ?= \ # 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-sensor-inventory ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-sensor-inventory-mrw-native', 'phosphor-ipmi-sensor-inventory-native')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-ipmi-sensor-inventory-mrw-native', 'phosphor-ipmi-sensor-inventory-native')}" # The phosphor-host-ipmid application is data-driven and requires an input # mapping of IPMI channel to DBus objects interfaces and properties. @@ -184,7 +184,7 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config ?= "phosphor-ipmi-channe # 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')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-ipmi-inventory-sel-mrw-native', 'phosphor-ipmi-inventory-sel-native')}" # Various other overrides. @@ -194,7 +194,7 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel ?= \ # 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')}" + "${@df_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 @@ -204,7 +204,7 @@ PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= \ # configuration files in the format and native sysroot location expected by # the phosphor-logging build process in the native sysroot. PREFERRED_PROVIDER_virtual/phosphor-logging-callouts ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-logging-callouts-mrw-native', 'phosphor-logging-callouts-example-native')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-logging-callouts-mrw-native', 'phosphor-logging-callouts-example-native')}" # The phosphor-fan-presence application is data driven and requires an # input YAML that maps fans to their tach sensors. @@ -212,7 +212,7 @@ PREFERRED_PROVIDER_virtual/phosphor-logging-callouts ?= \ # configuration files in the format and native sysroot location expected by # the phosphor-fan-presence build process in the native sysroot. PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'phosphor-fan-presence-mrw-native', 'phosphor-fan-presence-config-native')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-fan-presence-mrw-native', 'phosphor-fan-presence-config-native')}" # The phosphor-fan-control application is data driven and requires a YAML # file to define the fans in the system. @@ -220,7 +220,7 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config ?= \ # the YAML file in the format and native sysroot location expected by # the phosphor-fan-control build process in the native sysroot. 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')}" + "${@df_enabled(d, 'obmc-mrw', 'phosphor-fan-control-fan-config-mrw-native', 'phosphor-fan-control-fan-config-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 -- cgit v1.2.3