commit c31b23c4c83761c7a8fbc86e52d80ab220d8788d
author Patrick Williams <patrick@stwcx.xyz> Sat Feb 01 08:38:22 2025 -0500
committer Patrick Williams <patrick@stwcx.xyz> Sat Feb 01 08:38:22 2025 -0500
tree f99953d04918c57c6b62e06a98c8b28e9fa1dd46
parent 045aceaeaf80656e5a5fd85067ae04935f3bcf6c

meson: reformat with meson formatter

Apply the `meson format` results.

Change-Id: I57b515537c17c1d98424a8351edb4213de61cdc5
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

meson.build

diff --git a/meson.build b/meson.build
index 420a780..ca46b2d 100644
--- a/meson.build
+++ b/meson.build
@@ -2,18 +2,13 @@
     'phosphor-ecc',
     'cpp',
     version: '1.0',
-    default_options: [
-        'cpp_std=c++23',
-    ],
+    default_options: ['cpp_std=c++23'],
     meson_version: '>=1.1.1',
 )
 
 executable(
     'ecc_main',
-    [
-        'ecc_main.cpp',
-        'ecc_manager.cpp',
-    ],
+    ['ecc_main.cpp', 'ecc_manager.cpp'],
     dependencies: [
         dependency('sdbusplus'),
         dependency('sdeventplus'),
@@ -21,28 +16,34 @@
         dependency('phosphor-logging'),
     ],
     install: true,
-    install_dir: get_option('bindir')
+    install_dir: get_option('bindir'),
 )
 
-install_data(sources : 'maxlog.conf', install_dir : '/etc/ecc')
+install_data(sources: 'maxlog.conf', install_dir: '/etc/ecc')
 
 conf_data = configuration_data()
 conf_data.set('BUSNAME', '"xyz.openbmc_project.memory.ECC"')
 conf_data.set('OBJROOT', '"/xyz/openbmc_project/metrics/memory/"')
 conf_data.set('OBJPATH', '"/xyz/openbmc_project/metrics/memory/BmcECC"')
 conf_data.set('sysfsRootPath', '"/sys/devices/system/edac/mc/mc0/"')
-conf_data.set('sysfsEDACReportPath', '"/sys/module/edac_core/parameters/edac_report"')
-conf_data.set('ECC_PHOSPHOR_LOGGING', get_option('ecc-phosphor-logging').enabled())
+conf_data.set(
+    'sysfsEDACReportPath',
+    '"/sys/module/edac_core/parameters/edac_report"',
+)
+conf_data.set(
+    'ECC_PHOSPHOR_LOGGING',
+    get_option('ecc-phosphor-logging').enabled(),
+)
 
-configure_file(output : 'config.h',
-               configuration : conf_data)
+configure_file(output: 'config.h', configuration: conf_data)
 
 systemd = dependency('systemd')
 conf_data = configuration_data()
 conf_data.set('bindir', get_option('prefix') / get_option('bindir'))
 configure_file(
-  input: 'phosphor-ecc.service.in',
-  output: 'phosphor-ecc.service',
-  configuration: conf_data,
-  install: true,
-  install_dir: systemd.get_variable('systemdsystemunitdir'))
+    input: 'phosphor-ecc.service.in',
+    output: 'phosphor-ecc.service',
+    configuration: conf_data,
+    install: true,
+    install_dir: systemd.get_variable('systemdsystemunitdir'),
+)

meson.options

diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..9be85db
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,6 @@
+option(
+    'ecc-phosphor-logging',
+    type: 'feature',
+    value: 'disabled',
+    description: 'Create Event logs by using phosphor-logging.',
+)

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index aed2358..0000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-option('ecc-phosphor-logging', type: 'feature', value: 'disabled',
-    description: 'Create Event logs by using phosphor-logging.')