commit 49d12d8955495d4091b4520605c9e4510fcd743b
author Ed Tanous <edtanous@google.com> Thu Feb 11 13:44:15 2021 -0800
committer Ed Tanous <ed@tanous.net> Thu Feb 11 22:19:36 2021 +0000
tree 66daee1a63d2f80a82a1e750d172328f42b421b4
parent 495855861648f082a73d4ba4afe23262d6fb0ad0

Fix mcu option

If the mcu temp sensor is not included in a build, it isn't showing up.
This is due to meson_options.txt having 2 different names for mcu;  mcu,
and mcu-temp.  The upstream recipe uses mcu to key, so lets just do
that.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ib84c96b97c534c81e9e4e83c838dffe4e26b6957

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index ba935d7..918d206 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,8 +5,7 @@
 option('hwmon-temp', type: 'feature', value: 'enabled', description: 'Enable HWMON temperature sensor.',)
 option('intrusion', type: 'feature', value: 'enabled', description: 'Enable intrusion sensor.',)
 option('ipmb', type: 'feature', value: 'enabled', description: 'Enable IPMB sensor.',)
-option('mcu', type: 'feature', value: 'enabled', description: 'Enable CPU sensor.',)
-option('mcu-temp', type: 'feature', value: 'enabled', description: 'Enable MCU sensor.',)
+option('mcu', type: 'feature', value: 'enabled', description: 'Enable MCU sensor.',)
 option('nvme', type: 'feature', value: 'disabled', description: 'Enable NVMe sensor.',)
 option('psu', type: 'feature', value: 'enabled', description: 'Enable PSU sensor.',)
 option('external', type: 'feature', value: 'enabled', description: 'Enable External sensor.',)

service_files/meson.build

diff --git a/service_files/meson.build b/service_files/meson.build
index cbfb6e4..64d0974 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -6,7 +6,7 @@
     ['hwmon-temp', 'xyz.openbmc_project.hwmontempsensor.service'],
     ['ipmb', 'xyz.openbmc_project.ipmbsensor.service'],
     ['intrusion', 'xyz.openbmc_project.intrusionsensor.service'],
-    ['mcu-temp', 'xyz.openbmc_project.mcutempsensor.service'],
+    ['mcu', 'xyz.openbmc_project.mcutempsensor.service'],
     ['nvme', 'xyz.openbmc_project.nvmesensor.service'],
     ['psu', 'xyz.openbmc_project.psusensor.service'],
 ]

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index ad53332..dc11177 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -134,7 +134,7 @@
     )
 endif
 
-if get_option('mcu-temp').enabled()
+if get_option('mcu').enabled()
     executable(
         'mcutempsensor',
         'MCUTempSensor.cpp',