From 31a14fb0042c926940006e0389f1730912c15d92 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sun, 30 Mar 2025 00:19:58 +0900 Subject: [PATCH 1/2] plugins: move meson.build solidigm-nvme.c into solidigm/meson.build Add as same with other solidigm sources added by solidigm/meson.build. Signed-off-by: Tokunori Ikegami --- plugins/meson.build | 3 --- plugins/solidigm/meson.build | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index 3f49bf2764..df84d35c20 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,9 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later if json_c_dep.found() - sources += [ - 'plugins/solidigm/solidigm-nvme.c', - ] subdir('solidigm') endif diff --git a/plugins/solidigm/meson.build b/plugins/solidigm/meson.build index df2dc57475..3ab3e99e2b 100644 --- a/plugins/solidigm/meson.build +++ b/plugins/solidigm/meson.build @@ -1,4 +1,5 @@ sources += [ + 'plugins/solidigm/solidigm-nvme.c', 'plugins/solidigm/solidigm-id-ctrl.c', 'plugins/solidigm/solidigm-util.c', 'plugins/solidigm/solidigm-smart.c', From 369e0228748689081e84825aa49c674fb0f91b98 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sun, 30 Mar 2025 00:31:53 +0900 Subject: [PATCH 2/2] plugins: sort subdir list as alphabetical order This is to find easily the sub-commands name from the help list. Signed-off-by: Tokunori Ikegami --- plugins/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index df84d35c20..85ca57b029 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,9 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -if json_c_dep.found() - subdir('solidigm') -endif - sources += [ 'plugins/amzn/amzn-nvme.c', 'plugins/dapustor/dapustor-nvme.c', @@ -32,9 +28,13 @@ sources += [ 'plugins/zns/zns.c', ] -subdir('ocp') subdir('lm') +subdir('ocp') if conf.get('HAVE_SED_OPAL') != 0 subdir('sed') endif + +if json_c_dep.found() + subdir('solidigm') +endif