Move bootctl to its own source subdirectory

It's been split into a bunch of files and deserves its own subdirectory
similarly to systemctl.

diff --git a/meson.build b/meson.build
index f1339e065d18d9a095bc0a5f09154c18bbda253d..2624bd363bdef93de0fc714c88d8990f0786b719 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2346,6 +2346,7 @@ subdir('src/battery-check')
 subdir('src/binfmt')
 subdir('src/boot')
 subdir('src/boot/efi')
+subdir('src/bootctl')
 subdir('src/busctl')
 subdir('src/cgls')
 subdir('src/cgroups-agent')

diff --git a/src/boot/meson.build b/src/boot/meson.build
index a72388baff28d4cfc0f4be8f361fba5880f8508c..95e3c786fcd21e6703d6ac6f18310ab957254b1d 100644 (file)
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -1,17 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-bootctl_sources = files(
-        'bootctl-install.c',
-        'bootctl-random-seed.c',
-        'bootctl-reboot-to-firmware.c',
-        'bootctl-set-efivar.c',
-        'bootctl-status.c',
-        'bootctl-systemd-efi-options.c',
-        'bootctl-uki.c',
-        'bootctl-util.c',
-        'bootctl.c',
-)
-
 if get_option('link-boot-shared')
         boot_link_with = [libshared]
 else
@@ -22,16 +10,6 @@ else
 endif
 
 executables += [
-        executable_template + {
-                'name' : 'bootctl',
-                'public' : true,
-                'conditions' : [
-                          'HAVE_BLKID',
-                ],
-                'sources' : bootctl_sources,
-                'link_with' : boot_link_with,
-                'dependencies' : [libblkid, libopenssl],
-        },
         libexec_template + {
                 'name' : 'systemd-bless-boot',
                 'public' : true,

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

diff --git a/src/boot/bootctl-install.h b/src/bootctl/bootctl-install.h
similarity index 100%
rename from src/boot/bootctl-install.h
rename to src/bootctl/bootctl-install.h

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

diff --git a/src/boot/bootctl-random-seed.h b/src/bootctl/bootctl-random-seed.h
similarity index 100%
rename from src/boot/bootctl-random-seed.h
rename to src/bootctl/bootctl-random-seed.h

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

diff --git a/src/boot/bootctl-reboot-to-firmware.h b/src/bootctl/bootctl-reboot-to-firmware.h
similarity index 100%
rename from src/boot/bootctl-reboot-to-firmware.h
rename to src/bootctl/bootctl-reboot-to-firmware.h

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

diff --git a/src/boot/bootctl-set-efivar.h b/src/bootctl/bootctl-set-efivar.h
similarity index 100%
rename from src/boot/bootctl-set-efivar.h
rename to src/bootctl/bootctl-set-efivar.h

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

diff --git a/src/boot/bootctl-status.h b/src/bootctl/bootctl-status.h
similarity index 100%
rename from src/boot/bootctl-status.h
rename to src/bootctl/bootctl-status.h

diff --git a/src/boot/bootctl-systemd-efi-options.c b/src/bootctl/bootctl-systemd-efi-options.c
similarity index 100%
rename from src/boot/bootctl-systemd-efi-options.c
rename to src/bootctl/bootctl-systemd-efi-options.c

diff --git a/src/boot/bootctl-systemd-efi-options.h b/src/bootctl/bootctl-systemd-efi-options.h
similarity index 100%
rename from src/boot/bootctl-systemd-efi-options.h
rename to src/bootctl/bootctl-systemd-efi-options.h

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

diff --git a/src/boot/bootctl-uki.h b/src/bootctl/bootctl-uki.h
similarity index 100%
rename from src/boot/bootctl-uki.h
rename to src/bootctl/bootctl-uki.h

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

diff --git a/src/boot/bootctl-util.h b/src/bootctl/bootctl-util.h
similarity index 100%
rename from src/boot/bootctl-util.h
rename to src/bootctl/bootctl-util.h

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

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

diff --git a/src/bootctl/meson.build b/src/bootctl/meson.build
new file mode 100644 (file)
index 0000000..bcd12a2
--- /dev/null
+++ b/src/bootctl/meson.build
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+bootctl_sources = files(
+        'bootctl-install.c',
+        'bootctl-random-seed.c',
+        'bootctl-reboot-to-firmware.c',
+        'bootctl-set-efivar.c',
+        'bootctl-status.c',
+        'bootctl-systemd-efi-options.c',
+        'bootctl-uki.c',
+        'bootctl-util.c',
+        'bootctl.c',
+)
+
+executables += [
+        executable_template + {
+                'name' : 'bootctl',
+                'public' : true,
+                'conditions' : [
+                          'HAVE_BLKID',
+                ],
+                'sources' : bootctl_sources,
+                'link_with' : boot_link_with,
+                'dependencies' : [libblkid, libopenssl],
+        },
+]