Move growfs+makefs to src/growfs/

Those two programs are used together and it makes sense to keep them
together. makefs is smaller, so name the directory after growfs.

diff --git a/meson.build b/meson.build
index f579807945c4309cc7df19357ac119d76b230ca4..32c192965c4501f1b50cb679da5b6588c97a7d61 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2366,6 +2366,7 @@ subdir('src/fsck')
 subdir('src/fstab-generator')
 subdir('src/getty-generator')
 subdir('src/gpt-auto-generator')
+subdir('src/growfs')
 subdir('src/hibernate-resume')
 subdir('src/home')
 subdir('src/hostname')

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

diff --git a/src/partition/makefs.c b/src/growfs/makefs.c
similarity index 100%
rename from src/partition/makefs.c
rename to src/growfs/makefs.c

diff --git a/src/growfs/meson.build b/src/growfs/meson.build
new file mode 100644 (file)
index 0000000..0fcedb1
--- /dev/null
+++ b/src/growfs/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-growfs',
+                'sources' : files('growfs.c'),
+        },
+        libexec_template + {
+                'name' : 'systemd-makefs',
+                'sources' : files('makefs.c'),
+        },
+]

diff --git a/src/partition/meson.build b/src/partition/meson.build
index 2cfe43e029bc582a02acc2e30e8c44ed05e4c9b4..6920ef7ff0838993c939e88e039b312db2db6c80 100644 (file)
--- a/src/partition/meson.build
+++ b/src/partition/meson.build
@@ -1,14 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 executables += [
-        libexec_template + {
-                'name' : 'systemd-growfs',
-                'sources' : files('growfs.c'),
-        },
-        libexec_template + {
-                'name' : 'systemd-makefs',
-                'sources' : files('makefs.c'),
-        },
         executable_template + {
                 'name' : 'systemd-repart',
                 'public' : true,