nvmed: temporarily revert the change
Reverted `Disable-other-sensors-by-default` with patch to fix nvmed
crash issue.
Tested: No such crash after this revert
Google-Bug-Id: 317250605
Change-Id: I7a5e7e31eaaf36dbf078c59fa8b1bab22722164c
Signed-off-by: Hao Jiang <jianghao@google.com>
diff --git a/recipes-google/nvme/nvmed.bb b/recipes-google/nvme/nvmed.bb
index 8453854..f6e370c 100644
--- a/recipes-google/nvme/nvmed.bb
+++ b/recipes-google/nvme/nvmed.bb
@@ -25,6 +25,12 @@
inherit pkgconfig meson systemd
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = "\
+ file://0001-Revert-Disable-other-sensors-by-default.patch \
+"
+
EXTRA_OEMESON:append = " \
-Dadc=disabled \
-Dexit-air=disabled \
diff --git a/recipes-google/nvme/nvmed/0001-Revert-Disable-other-sensors-by-default.patch b/recipes-google/nvme/nvmed/0001-Revert-Disable-other-sensors-by-default.patch
new file mode 100644
index 0000000..e7fd3fd
--- /dev/null
+++ b/recipes-google/nvme/nvmed/0001-Revert-Disable-other-sensors-by-default.patch
@@ -0,0 +1,66 @@
+From de6d061c41b6c37f223b0992c04115b80e707822 Mon Sep 17 00:00:00 2001
+From: Hao Jiang <jianghao@google.com>
+Date: Thu, 21 Dec 2023 22:46:48 +0000
+Subject: [PATCH] Revert "Disable other sensors by default"
+
+This reverts commit 3ec80a56fa600f53fdd4ae052b28e4e31c281995.
+
+Reason:
+
+This patch was aimed to fix the unitest issue in presubmit. But the
+build flag is somehow caused the Utils library crashed in the plugin.
+
+Tested: No crash w/ the revert
+
+Signed-off-by: Hao Jiang <jianghao@google.com>
+---
+ meson.build | 3 +++
+ meson_options.txt | 20 ++++++++++----------
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5cd8bea..8d5df99 100644
+--- a/meson.build
++++ b/meson.build
+@@ -31,6 +31,9 @@ add_project_arguments(
+ '-DBOOST_ALL_NO_LIB',
+ '-DBOOST_ALLOW_DEPRECATED_HEADERS',
+ '-DBOOST_ASIO_HAS_THREADS',
++ '-DBOOST_ASIO_HAS_IO_URING',
++ '-DBOOST_ASIO_DISABLE_EPOLL',
++ '-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT',
+ language: 'cpp',
+ )
+
+diff --git a/meson_options.txt b/meson_options.txt
+index ed34ba4..bf686c4 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,14 +1,14 @@
+-option('adc', type: 'feature', value: 'disabled', description: 'Enable ADC sensor.',)
+-option('intel-cpu', type: 'feature', value: 'disabled', description: 'Enable CPU sensor.',)
+-option('exit-air', type: 'feature', value: 'disabled', description: 'Enable exit air sensor.',)
+-option('fan', type: 'feature', value: 'disabled', description: 'Enable fan sensor.',)
+-option('hwmon-temp', type: 'feature', value: 'disabled', description: 'Enable HWMON temperature sensor.',)
+-option('intrusion', type: 'feature', value: 'disabled', description: 'Enable intrusion sensor.',)
+-option('ipmb', type: 'feature', value: 'disabled', description: 'Enable IPMB sensor.',)
+-option('mcu', type: 'feature', value: 'disabled', description: 'Enable MCU sensor.',)
++option('adc', type: 'feature', value: 'enabled', description: 'Enable ADC sensor.',)
++option('intel-cpu', type: 'feature', value: 'enabled', description: 'Enable CPU sensor.',)
++option('exit-air', type: 'feature', value: 'enabled', description: 'Enable exit air sensor.',)
++option('fan', type: 'feature', value: 'enabled', description: 'Enable fan sensor.',)
++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 MCU sensor.',)
+ option('nvme', type: 'feature', value: 'enabled', description: 'Enable NVMe sensor.',)
+-option('psu', type: 'feature', value: 'disabled', description: 'Enable PSU sensor.',)
+-option('external', type: 'feature', value: 'disabled', description: 'Enable External 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', value: 'enabled', description: 'Build tests.',)
+ option('validate-unsecure-feature', type : 'feature', value : 'disabled', description : 'Enables unsecure features required by validation. Note: mustbe turned off for production images.',)
+ option('insecure-sensor-override', type : 'feature', value : 'disabled', description : 'Enables Sensor override feature without any check.',)
+--
+2.40.1
+
