summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2020-02-19 08:37:03 +0000
committerRaptor Engineering Development Team <support@raptorengineering.com>2020-02-19 09:17:16 +0000
commit92fa4ab49edcf2d4cb96a994e3430aa4766fe70b (patch)
tree5d9688be5d926cbde8c7655837103f3c6096dda8
parent16fc686ddef9d90ae2a155939b3e4750b7b4444f (diff)
downloadtalos-openbmc-92fa4ab49edcf2d4cb96a994e3430aa4766fe70b.tar.gz
talos-openbmc-92fa4ab49edcf2d4cb96a994e3430aa4766fe70b.zip
Relabel fan tach inventory items for clarity in the Web UI
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch13
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend2
2 files changed, 15 insertions, 0 deletions
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch
new file mode 100644
index 000000000..383310246
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch
@@ -0,0 +1,13 @@
+diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
+index 5494450..6832ffe 100644
+--- a/monitor/tach_sensor.cpp
++++ b/monitor/tach_sensor.cpp
+@@ -81,7 +81,7 @@ TachSensor::TachSensor(Mode mode,
+ _bus(bus),
+ _fan(fan),
+ _name(FAN_SENSOR_PATH + id),
+- _invName(path(fan.getName()) / id),
++ _invName(path(fan.getName()) / (id + "tach")),
+ _hasTarget(hasTarget),
+ _funcDelay(funcDelay),
+ _interface(interface),
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 36751c29a..0035eee8d 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -5,6 +5,8 @@ FAN_PACKAGES += " \
phosphor-cooling-type \
"
+SRC_URI += "file://label-fan-tachs-in-inventory.patch"
+
PACKAGECONFIG += "cooling-type"
RDEPENDS_phosphor-cooling-type += "libevdev"
OpenPOWER on IntegriCloud