diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
commit | 5364646cb66fa75cdcbf148e039e0383cda94f2a (patch) | |
tree | 78b1711f353235e812435be90e124eab4037294e /meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb | |
parent | 816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5 (diff) | |
parent | 7b595c2f82912a170774e84e5bb81d1b6030bf6b (diff) | |
download | openbmc-5364646cb66fa75cdcbf148e039e0383cda94f2a.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb')
-rw-r--r-- | meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 219d6ff32..e7c557ae4 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -39,7 +39,7 @@ SYSTEMD_PACKAGES = "${FAN_PACKAGES}" # ${PN}-presence-tach specific configuration PACKAGECONFIG[presence] = " \ --enable-presence \ - PRESENCE_CONFIG=${STAGING_DIR_NATIVE}${presence_datadir}/config.yaml, \ + PRESENCE_CONFIG=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ --disable-presence, \ virtual/phosphor-fan-presence-config \ , \ @@ -51,23 +51,23 @@ INSTFMT_TACH = "phosphor-fan-presence-tach@{0}.service" POWERON_TGT = "obmc-chassis-poweron@{0}.target" FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.requires/${INSTFMT_TACH}" -FILES_${PN}-presence-tach = "${sbindir}/phosphor-fan-presence-tach" +FILES_${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" SYSTEMD_SERVICE_${PN}-presence-tach += "${TMPL_TACH}" SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" # -------------------------------------- # ${PN}-control specific configuration PACKAGECONFIG[control] = "--enable-control \ - FAN_DEF_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/fans.yaml \ - FAN_ZONE_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/zones.yaml \ - ZONE_EVENTS_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_NATIVE}${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-native \ - phosphor-fan-control-events-config-native \ - phosphor-fan-control-zone-conditions-config-native \ + phosphor-fan-control-zone-config \ + phosphor-fan-control-events-config \ + phosphor-fan-control-zone-conditions-config \ , \ " @@ -81,7 +81,7 @@ TMPL_CONTROL_INIT = "phosphor-fan-control-init@.service" INSTFMT_CONTROL_INIT = "phosphor-fan-control-init@{0}.service" FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.wants/${INSTFMT_CONTROL_INIT}" -FILES_${PN}-control = "${sbindir}/phosphor-fan-control" +FILES_${PN}-control = "${bindir}/phosphor-fan-control" SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" @@ -89,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=${STAGING_DIR_NATIVE}${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-native \ + phosphor-fan-monitor-config \ , \ " @@ -104,7 +104,7 @@ TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service" INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service" FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}" -FILES_${PN}-monitor = "${sbindir}/phosphor-fan-monitor" +FILES_${PN}-monitor = "${bindir}/phosphor-fan-monitor" SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR} ${TMPL_MONITOR_INIT}" SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES')}" |