From c1e2e33752e967511b6311ba7687d8422c263fc9 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 19 Aug 2020 18:56:19 -0700 Subject: [PATCH] meson: Fix lmsensors warning message. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 138c003d2273 ("meson: deprecated 'true' and 'false' in combo options for 'enabled' and 'disabled'") Signed-off-by: Vinson Lee Reviewed-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 855afe01449690e1ed21f9085718551e5ea09bbd) --- .pick_status.json | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e0034081b6a..ed56aaf46d1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1525,7 +1525,7 @@ "description": "meson: Fix lmsensors warning message.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "138c003d22739b0d1e6860ed398dd511a44cde04" }, diff --git a/meson.build b/meson.build index e8b641c6b1d..291ae424850 100644 --- a/meson.build +++ b/meson.build @@ -1762,10 +1762,10 @@ endif _sensors = get_option('lmsensors') if _sensors == 'true' _sensors = 'enabled' - warning('sensors option "true" deprecated, please use "enabled" instead.') + warning('lmsensors option "true" deprecated, please use "enabled" instead.') elif _sensors == 'false' _sensors = 'disabled' - warning('sensors option "false" deprecated, please use "disabled" instead.') + warning('lmsensors option "false" deprecated, please use "disabled" instead.') endif if _sensors != 'disabled' dep_lmsensors = cc.find_library('sensors', required : _sensors == 'enabled')