diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-14 06:12:55 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-22 02:14:54 +0300 |
| commit | c8b67b3df0b479331c7bce4135eb90cf143dde1e (patch) | |
| tree | e81bd59cfa9b1dbc0bffb17a4c1f2fd9da1e178d /meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb | |
| parent | c317a38db1a9a0f63b32adbe380576e0a91a6cf2 (diff) | |
| download | openbmc-c8b67b3df0b479331c7bce4135eb90cf143dde1e.tar.xz | |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index dc82cba75..e7c557ae4 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -10,7 +10,6 @@ inherit autotools pkgconfig pythonnative inherit obmc-phosphor-systemd inherit phosphor-fan -PHOSPHOR_FAN_STAGING_DIR = "${@bb.utils.contains('PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT', '1', '${STAGING_DIR_NATIVE}', '${STAGING_DIR_HOST}', d)}" S = "${WORKDIR}/git" # Common build dependencies @@ -40,7 +39,7 @@ SYSTEMD_PACKAGES = "${FAN_PACKAGES}" # ${PN}-presence-tach specific configuration PACKAGECONFIG[presence] = " \ --enable-presence \ - PRESENCE_CONFIG=${PHOSPHOR_FAN_STAGING_DIR}${presence_datadir}/config.yaml, \ + PRESENCE_CONFIG=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ --disable-presence, \ virtual/phosphor-fan-presence-config \ , \ @@ -59,16 +58,16 @@ SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSI # -------------------------------------- # ${PN}-control specific configuration PACKAGECONFIG[control] = "--enable-control \ - FAN_DEF_YAML_FILE=${PHOSPHOR_FAN_STAGING_DIR}${control_datadir}/fans.yaml \ - FAN_ZONE_YAML_FILE=${PHOSPHOR_FAN_STAGING_DIR}${control_datadir}/zones.yaml \ - ZONE_EVENTS_YAML_FILE=${PHOSPHOR_FAN_STAGING_DIR}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${PHOSPHOR_FAN_STAGING_DIR}${control_datadir}/zone_conditions.yaml \ + FAN_DEF_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ + FAN_ZONE_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ + ZONE_EVENTS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ + ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml \ FAN_ZONE_OUTPUT_DIR=${S}/control, \ --disable-control, \ virtual/phosphor-fan-control-fan-config \ - phosphor-fan-control-zone-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX} \ - phosphor-fan-control-events-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX} \ - phosphor-fan-control-zone-conditions-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX} \ + phosphor-fan-control-zone-config \ + phosphor-fan-control-events-config \ + phosphor-fan-control-zone-conditions-config \ , \ " @@ -90,10 +89,10 @@ SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHAS # -------------------------------------- # ${PN}-monitor specific configuration PACKAGECONFIG[monitor] = "--enable-monitor \ - FAN_MONITOR_YAML_FILE=${PHOSPHOR_FAN_STAGING_DIR}${monitor_datadir}/monitor.yaml \ + FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml \ FAN_MONITOR_OUTPUT_DIR=${S}/monitor, \ --disable-monitor, \ - phosphor-fan-monitor-config${PHOSPHOR_FAN_CONFIG_RECIPE_SUFFIX} \ + phosphor-fan-monitor-config \ , \ " |