Move systemd-measure to its own source subdirectory

We have other subdirectories with just a single C file. And I expect
that systemd-measure will only grow over time, adding new functionality.
It's nicer to give its own subdirectory to maintain consistent structure.

diff --git a/meson.build b/meson.build
index e76115a619bd574e20428584895c68dc644d76b7..4a0a7749bfc8c705d84480450a42bbcf7637479c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2382,6 +2382,7 @@ subdir('src/locale')
 subdir('src/login')
 subdir('src/machine')
 subdir('src/machine-id-setup')
+subdir('src/measure')
 subdir('src/mountfsd')
 subdir('src/modules-load')
 subdir('src/mount')

diff --git a/src/boot/meson.build b/src/boot/meson.build
index 095387384e28dcee228822cfabf560ab8c13481d..b6e0dbcde9c038f81ddc064ddbb7b29d6c14d641 100644 (file)
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -1,16 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 executables += [
-        libexec_template + {
-                'name' : 'systemd-measure',
-                'conditions' : [
-                        'HAVE_BLKID',
-                        'HAVE_OPENSSL',
-                        'HAVE_TPM2',
-                ],
-                'sources' : files('measure.c'),
-                'dependencies' : libopenssl,
-        },
         libexec_template + {
                 'name' : 'systemd-sbsign',
                 'conditions' : [

diff --git a/src/boot/measure.c b/src/measure/measure.c
similarity index 100%
rename from src/boot/measure.c
rename to src/measure/measure.c

diff --git a/src/measure/meson.build b/src/measure/meson.build
new file mode 100644 (file)
index 0000000..13a8901
--- /dev/null
+++ b/src/measure/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-measure',
+                'conditions' : [
+                        'HAVE_BLKID',
+                        'HAVE_OPENSSL',
+                        'HAVE_TPM2',
+                ],
+                'sources' : files('measure.c'),
+                'dependencies' : libopenssl,
+        },
+]