meson: Fix psusensor
The psu sensor's process name was incorrectly set to psutempsensor and
is inconsistent with the service unit.
Fix this and use `psu` as the configure option instead of `psu-temp`,
because it is really psusensor including temperature/current/voltage/fan
sensors.
Tested: Verify the build binary is named as `psusensor`.
Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: Iee6bcdbb948a58dd10cfe26ab268944f1f9a14e6
diff --git a/meson_options.txt b/meson_options.txt
index 5fa3fd3..ba935d7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,6 +8,6 @@
option('mcu', type: 'feature', value: 'enabled', description: 'Enable CPU sensor.',)
option('mcu-temp', type: 'feature', value: 'enabled', description: 'Enable MCU sensor.',)
option('nvme', type: 'feature', value: 'disabled', description: 'Enable NVMe sensor.',)
-option('psu-temp', type: 'feature', value: 'enabled', description: 'Enable PSU sensor.',)
+option('psu', type: 'feature', value: 'enabled', description: 'Enable PSU sensor.',)
option('external', type: 'feature', value: 'enabled', description: 'Enable External sensor.',)
option('tests', type: 'feature', description: 'Build tests.',)
diff --git a/service_files/meson.build b/service_files/meson.build
index 9158ef2..cbfb6e4 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -8,7 +8,7 @@
['intrusion', 'xyz.openbmc_project.intrusionsensor.service'],
['mcu-temp', 'xyz.openbmc_project.mcutempsensor.service'],
['nvme', 'xyz.openbmc_project.nvmesensor.service'],
- ['psu-temp', 'xyz.openbmc_project.psusensor.service'],
+ ['psu', 'xyz.openbmc_project.psusensor.service'],
]
foreach tuple : unit_files
@@ -21,6 +21,4 @@
output: tuple[1],
)
endif
-
-
endforeach
diff --git a/src/meson.build b/src/meson.build
index 32b6e85..ad53332 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -156,7 +156,7 @@
executable(
'nvmesensor',
'NVMeSensorMain.cpp',
- 'NVMeSensor.cpp',
+ 'NVMeSensor.cpp',
dependencies: [
i2c,
sdbusplus,
@@ -172,9 +172,9 @@
)
endif
-if get_option('psu-temp').enabled()
+if get_option('psu').enabled()
executable(
- 'psutempsensor',
+ 'psusensor',
'PSUEvent.cpp',
'PSUSensor.cpp',
'PSUSensorMain.cpp',