diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2021-02-12 18:56:17 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 15:41:18 +0300 |
| commit | 7fc35dd2b34b65b619ec19de7e01d49412241e2b (patch) | |
| tree | 1e34ceda3a466d369986d133ce65f09f2e3f8c98 | |
| parent | ab79e2ad6e7dcd18a9663dfa0dca4cfef76bc13f (diff) | |
| download | openbmc-7fc35dd2b34b65b619ec19de7e01d49412241e2b.tar.xz | |
ibm: Install sensor-monitor on rainier
This application resides in the phosphor-fan-presence repo and creates
phosphor-logging based event logs for temperature threshold alarms.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Id5a7ce7590efe82eb1f9615853cabd58ac269c24
3 files changed, 11 insertions, 2 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 09d4fd601..3d6829a2d 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -61,7 +61,8 @@ EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -PACKAGECONFIG_append_rainier = " json" +PACKAGECONFIG_append_rainier = " json sensor-monitor" +FAN_PACKAGES_append_rainier = " sensor-monitor" RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 29a567e27..f83c31664 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -26,7 +26,7 @@ RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-oc RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" -RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog" +RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog sensor-monitor" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} webui-vue dbus-sensors phosphor-virtual-sensor" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index adad34900..e1eb2caca 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -119,3 +119,11 @@ SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHAS # -------------------------------------- # phosphor-cooling-type specific configuration PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," + +# -------------------------------------- +# ${PN}-sensor-monitor specific configuration +PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monitor" + +FILES_sensor-monitor += " ${bindir}/sensor-monitor" +SYSTEMD_SERVICE_sensor-monitor += "sensor-monitor.service" +SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" |