From c8b67b3df0b479331c7bce4135eb90cf143dde1e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 13 May 2019 23:12:55 -0400 Subject: meta-phosphor: fans: remove native support All OpenBMC BSP layers have moved to target class config recipes. As such, support for native class config recipes can be removed. (From meta-phosphor rev: f3b437c327b94df6f22c7d821f25d76f1d1c2180) Change-Id: I7729f7e34529a220af36b88017cb48a3ee887acb Signed-off-by: Brad Bishop --- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 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 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 -- cgit v1.2.3