commit 6b7fa8193250fa61f0c44ca54480fc42974817dc
author Patrick Williams <patrick@stwcx.xyz> Sat Feb 01 08:38:17 2025 -0500
committer Patrick Williams <patrick@stwcx.xyz> Sat Feb 01 08:38:17 2025 -0500
tree bf85e739854f28f6cd63e2004335c2cd85d99b17
parent abc613ef4df43e8eef9d9be1b3a01ddf64586d13

meson: reformat with meson formatter

Apply the `meson format` results.

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

firstboot/meson.build

diff --git a/firstboot/meson.build b/firstboot/meson.build
index 8b3dee7..743eab5 100644
--- a/firstboot/meson.build
+++ b/firstboot/meson.build
@@ -1,5 +1,8 @@
 set_mac = dependency('systemd', required: get_option('first-boot-set-mac'))
-set_hostname = dependency('systemd', required: get_option('first-boot-set-hostname'))
+set_hostname = dependency(
+    'systemd',
+    required: get_option('first-boot-set-hostname'),
+)
 
 if set_mac.found()
     install_data(
@@ -12,8 +15,7 @@
         input: 'first-boot-set-mac@.service',
         output: 'first-boot-set-mac@.service',
         copy: true,
-        install_dir:
-            set_mac.get_variable('systemdsystemunitdir'),
+        install_dir: set_mac.get_variable('systemdsystemunitdir'),
     )
 endif
 
@@ -28,7 +30,6 @@
         input: 'first-boot-set-hostname.service',
         output: 'first-boot-set-hostname.service',
         copy: true,
-        install_dir:
-            set_hostname.get_variable('systemdsystemunitdir'),
+        install_dir: set_hostname.get_variable('systemdsystemunitdir'),
     )
 endif

http-redirect/meson.build

diff --git a/http-redirect/meson.build b/http-redirect/meson.build
index 758b55e..1d2e612 100644
--- a/http-redirect/meson.build
+++ b/http-redirect/meson.build
@@ -8,18 +8,14 @@
         install_dir: get_option('bindir'),
     )
 
-    unit_files = [
-        'http-redirect.socket',
-        'http-redirect@.service'
-    ]
+    unit_files = ['http-redirect.socket', 'http-redirect@.service']
 
     foreach unit : unit_files
         configure_file(
             input: unit,
             output: unit,
             copy: true,
-            install_dir:
-                redirect.get_variable('systemdsystemunitdir'),
+            install_dir: redirect.get_variable('systemdsystemunitdir'),
         )
     endforeach
 endif

meson.build

diff --git a/meson.build b/meson.build
index 13366c5..b058e53 100644
--- a/meson.build
+++ b/meson.build
@@ -1,8 +1,4 @@
-project(
-    'phosphor-misc', 'c',
-    license: 'Apache-2.0',
-    version: '1.0',
-)
+project('phosphor-misc', 'c', license: 'Apache-2.0', version: '1.0')
 
 subdir('firstboot')
 subdir('http-redirect')

meson.options

diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..cf07e8c
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,16 @@
+option(
+    'first-boot-set-mac',
+    type: 'feature',
+    description: 'Set MAC address on first boot.',
+)
+option(
+    'first-boot-set-hostname',
+    type: 'feature',
+    description: 'Set hostname on first boot.',
+)
+option(
+    'http-redirect',
+    type: 'feature',
+    description: 'Redirect http traffic to https.',
+)
+option('usb-ctrl', type: 'feature', description: 'Control USB gadget devices')

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index 75405d9..0000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-option(
-    'first-boot-set-mac', type: 'feature', description: 'Set MAC address on first boot.',
-)
-option(
-    'first-boot-set-hostname', type: 'feature', description: 'Set hostname on first boot.',
-)
-option(
-    'http-redirect', type: 'feature', description: 'Redirect http traffic to https.',
-)
-option(
-    'usb-ctrl', type: 'feature', description: 'Control USB gadget devices',
-)