diff options
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 6 | ||||
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-mrw.inc | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index ee38c56c1..f99fbed43 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -1,5 +1,3 @@ -PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT ?= "1" -PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX = "${@bb.utils.contains('PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT', '1', '-native', '', d)}" OBMC_BMC_INSTANCES ?= "0" OBMC_CHASSIS_INSTANCES ?= "0" OBMC_CHECKSTOP_INSTANCES ?= "0" @@ -202,14 +200,14 @@ PREFERRED_PROVIDER_virtual/phosphor-logging-callouts ?= \ # sysroot location expected by the phosphor-fan-presence build process in the # sysroot. PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config ?= \ - "phosphor-fan-presence-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX}" + "phosphor-fan-presence-config" # The phosphor-fan-control application is data driven and requires a YAML file # to define the fans in the system. This virtual is a recipe that provides # that definition by installing the YAML file in the format and sysroot # location expected by the phosphor-fan-control build process in the sysroot. PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config ?= \ - "phosphor-fan-control-fan-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX}" + "phosphor-fan-control-fan-config" # The phosphor-gpio-monitor application is data-driven and requires an input. # The application then watches the passed in input event entry for the diff --git a/meta-phosphor/conf/distro/include/phosphor-mrw.inc b/meta-phosphor/conf/distro/include/phosphor-mrw.inc index 2e8de5f37..9fe8618a4 100644 --- a/meta-phosphor/conf/distro/include/phosphor-mrw.inc +++ b/meta-phosphor/conf/distro/include/phosphor-mrw.inc @@ -13,5 +13,5 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory_df-mrw ?= "phosphor-ip PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel_df-mrw ?= "phosphor-ipmi-inventory-sel-mrw-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw ?= "phosphor-led-manager-config-mrw-native" PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw ?= "phosphor-logging-callouts-mrw-native" -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw ?= "phosphor-fan-presence-mrw${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX}" -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw ?= "phosphor-fan-control-fan-config-mrw${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX}" +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw ?= "phosphor-fan-presence-mrw" +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw ?= "phosphor-fan-control-fan-config-mrw" |