From a32e1f88967b3d9d0fd02fd53c7359b08ea3f67c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 10 Nov 2024 14:01:34 +0100
Subject: [PATCH] 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.
---
 meson.build                        |  1 +
 src/{partition => growfs}/growfs.c |  0
 src/{partition => growfs}/makefs.c |  0
 src/growfs/meson.build             | 12 ++++++++++++
 src/partition/meson.build          |  8 --------
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename src/{partition => growfs}/growfs.c (100%)
 rename src/{partition => growfs}/makefs.c (100%)
 create mode 100644 src/growfs/meson.build

diff --git a/meson.build b/meson.build
index f579807945c..32c192965c4 100644
--- 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
index 00000000000..0fcedb19d96
--- /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 2cfe43e029b..6920ef7ff08 100644
--- 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,
-- 
2.47.3