From 0b676aab33be2fa8b092f1bf5f1f4e04f072eda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2024 12:24:40 +0100 Subject: [PATCH 1/5] Move bootctl to its own source subdirectory It's been split into a bunch of files and deserves its own subdirectory similarly to systemctl. --- meson.build | 1 + src/boot/meson.build | 22 ---------------- src/{boot => bootctl}/bootctl-install.c | 0 src/{boot => bootctl}/bootctl-install.h | 0 src/{boot => bootctl}/bootctl-random-seed.c | 0 src/{boot => bootctl}/bootctl-random-seed.h | 0 .../bootctl-reboot-to-firmware.c | 0 .../bootctl-reboot-to-firmware.h | 0 src/{boot => bootctl}/bootctl-set-efivar.c | 0 src/{boot => bootctl}/bootctl-set-efivar.h | 0 src/{boot => bootctl}/bootctl-status.c | 0 src/{boot => bootctl}/bootctl-status.h | 0 .../bootctl-systemd-efi-options.c | 0 .../bootctl-systemd-efi-options.h | 0 src/{boot => bootctl}/bootctl-uki.c | 0 src/{boot => bootctl}/bootctl-uki.h | 0 src/{boot => bootctl}/bootctl-util.c | 0 src/{boot => bootctl}/bootctl-util.h | 0 src/{boot => bootctl}/bootctl.c | 0 src/{boot => bootctl}/bootctl.h | 0 src/bootctl/meson.build | 26 +++++++++++++++++++ 21 files changed, 27 insertions(+), 22 deletions(-) rename src/{boot => bootctl}/bootctl-install.c (100%) rename src/{boot => bootctl}/bootctl-install.h (100%) rename src/{boot => bootctl}/bootctl-random-seed.c (100%) rename src/{boot => bootctl}/bootctl-random-seed.h (100%) rename src/{boot => bootctl}/bootctl-reboot-to-firmware.c (100%) rename src/{boot => bootctl}/bootctl-reboot-to-firmware.h (100%) rename src/{boot => bootctl}/bootctl-set-efivar.c (100%) rename src/{boot => bootctl}/bootctl-set-efivar.h (100%) rename src/{boot => bootctl}/bootctl-status.c (100%) rename src/{boot => bootctl}/bootctl-status.h (100%) rename src/{boot => bootctl}/bootctl-systemd-efi-options.c (100%) rename src/{boot => bootctl}/bootctl-systemd-efi-options.h (100%) rename src/{boot => bootctl}/bootctl-uki.c (100%) rename src/{boot => bootctl}/bootctl-uki.h (100%) rename src/{boot => bootctl}/bootctl-util.c (100%) rename src/{boot => bootctl}/bootctl-util.h (100%) rename src/{boot => bootctl}/bootctl.c (100%) rename src/{boot => bootctl}/bootctl.h (100%) create mode 100644 src/bootctl/meson.build diff --git a/meson.build b/meson.build index f1339e065d1..2624bd363bd 100644 --- 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 a72388baff2..95e3c786fcd 100644 --- 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 index 00000000000..bcd12a2f612 --- /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], + }, +] From daf72e8df1edc1ea1f7ec6330294dcafc1e2f6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2024 12:28:42 +0100 Subject: [PATCH 2/5] Move bless-boot components to their own source subdirectory --- meson.build | 1 + .../bless-boot-generator.c | 0 src/{boot => bless-boot}/bless-boot.c | 0 .../boot-check-no-failures.c | 0 src/bless-boot/meson.build | 37 +++++++++++++++++++ src/boot/meson.build | 33 ----------------- 6 files changed, 38 insertions(+), 33 deletions(-) rename src/{boot => bless-boot}/bless-boot-generator.c (100%) rename src/{boot => bless-boot}/bless-boot.c (100%) rename src/{boot => bless-boot}/boot-check-no-failures.c (100%) create mode 100644 src/bless-boot/meson.build diff --git a/meson.build b/meson.build index 2624bd363bd..e76115a619b 100644 --- a/meson.build +++ b/meson.build @@ -2344,6 +2344,7 @@ subdir('src/ask-password') subdir('src/backlight') subdir('src/battery-check') subdir('src/binfmt') +subdir('src/bless-boot') subdir('src/boot') subdir('src/boot/efi') subdir('src/bootctl') diff --git a/src/boot/bless-boot-generator.c b/src/bless-boot/bless-boot-generator.c similarity index 100% rename from src/boot/bless-boot-generator.c rename to src/bless-boot/bless-boot-generator.c diff --git a/src/boot/bless-boot.c b/src/bless-boot/bless-boot.c similarity index 100% rename from src/boot/bless-boot.c rename to src/bless-boot/bless-boot.c diff --git a/src/boot/boot-check-no-failures.c b/src/bless-boot/boot-check-no-failures.c similarity index 100% rename from src/boot/boot-check-no-failures.c rename to src/bless-boot/boot-check-no-failures.c diff --git a/src/bless-boot/meson.build b/src/bless-boot/meson.build new file mode 100644 index 00000000000..003f110664d --- /dev/null +++ b/src/bless-boot/meson.build @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +if get_option('link-boot-shared') + boot_link_with = [libshared] +else + boot_link_with = [ + libshared_static, + libsystemd_static, + ] +endif + +executables += [ + libexec_template + { + 'name' : 'systemd-bless-boot', + 'public' : true, + 'conditions' : [ + 'HAVE_BLKID', + 'ENABLE_BOOTLOADER', + ], + 'sources' : files('bless-boot.c'), + 'link_with' : boot_link_with, + 'dependencies' : libblkid, + }, + generator_template + { + 'name' : 'systemd-bless-boot-generator', + 'conditions' : [ + 'HAVE_BLKID', + 'ENABLE_BOOTLOADER', + ], + 'sources' : files('bless-boot-generator.c'), + 'link_with' : boot_link_with, + }, + libexec_template + { + 'name' : 'systemd-boot-check-no-failures', + 'sources' : files('boot-check-no-failures.c'), + }, +] diff --git a/src/boot/meson.build b/src/boot/meson.build index 95e3c786fcd..095387384e2 100644 --- a/src/boot/meson.build +++ b/src/boot/meson.build @@ -1,35 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -if get_option('link-boot-shared') - boot_link_with = [libshared] -else - boot_link_with = [ - libshared_static, - libsystemd_static, - ] -endif - executables += [ - libexec_template + { - 'name' : 'systemd-bless-boot', - 'public' : true, - 'conditions' : [ - 'HAVE_BLKID', - 'ENABLE_BOOTLOADER', - ], - 'sources' : files('bless-boot.c'), - 'link_with' : boot_link_with, - 'dependencies' : libblkid, - }, - generator_template + { - 'name' : 'systemd-bless-boot-generator', - 'conditions' : [ - 'HAVE_BLKID', - 'ENABLE_BOOTLOADER', - ], - 'sources' : files('bless-boot-generator.c'), - 'link_with' : boot_link_with, - }, libexec_template + { 'name' : 'systemd-measure', 'conditions' : [ @@ -48,8 +19,4 @@ executables += [ 'sources' : files('sbsign.c'), 'dependencies' : libopenssl, }, - libexec_template + { - 'name' : 'systemd-boot-check-no-failures', - 'sources' : files('boot-check-no-failures.c'), - }, ] From 1dabec005698407ce3a2818758603d21b5be72d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2024 12:37:45 +0100 Subject: [PATCH 3/5] 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. --- meson.build | 1 + src/boot/meson.build | 10 ---------- src/{boot => measure}/measure.c | 0 src/measure/meson.build | 14 ++++++++++++++ 4 files changed, 15 insertions(+), 10 deletions(-) rename src/{boot => measure}/measure.c (100%) create mode 100644 src/measure/meson.build diff --git a/meson.build b/meson.build index e76115a619b..4a0a7749bfc 100644 --- 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 095387384e2..b6e0dbcde9c 100644 --- 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 index 00000000000..13a890170c5 --- /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, + }, +] From 5ffff673ac484747c5f66247e63617f2555dd96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2024 12:37:45 +0100 Subject: [PATCH 4/5] Move systemd-sbsign to its own source subdirectory It's already two files, and I expect that more will come. It's nicer to give its own subdirectory to maintain consistent structure. --- meson.build | 2 +- src/{boot => sbsign}/authenticode.h | 0 src/{boot => sbsign}/meson.build | 0 src/{boot => sbsign}/sbsign.c | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename src/{boot => sbsign}/authenticode.h (100%) rename src/{boot => sbsign}/meson.build (100%) rename src/{boot => sbsign}/sbsign.c (100%) diff --git a/meson.build b/meson.build index 4a0a7749bfc..f2b5ce5ea2b 100644 --- a/meson.build +++ b/meson.build @@ -2345,7 +2345,6 @@ subdir('src/backlight') subdir('src/battery-check') subdir('src/binfmt') subdir('src/bless-boot') -subdir('src/boot') subdir('src/boot/efi') subdir('src/bootctl') subdir('src/busctl') @@ -2411,6 +2410,7 @@ subdir('src/rfkill') subdir('src/rpm') subdir('src/run') subdir('src/run-generator') +subdir('src/sbsign') subdir('src/shutdown') subdir('src/sleep') subdir('src/socket-activate') diff --git a/src/boot/authenticode.h b/src/sbsign/authenticode.h similarity index 100% rename from src/boot/authenticode.h rename to src/sbsign/authenticode.h diff --git a/src/boot/meson.build b/src/sbsign/meson.build similarity index 100% rename from src/boot/meson.build rename to src/sbsign/meson.build diff --git a/src/boot/sbsign.c b/src/sbsign/sbsign.c similarity index 100% rename from src/boot/sbsign.c rename to src/sbsign/sbsign.c From 97318131fd06a5bc35454da81dcbbc84f16d9940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2024 12:45:28 +0100 Subject: [PATCH 5/5] Rename src/boot/efi to just src/boot I very much dislike the approach in which we were mixing Linux and UEFI C code in the same subdirectory. No code was shared between two environments. This layout was created in e7dd673d1e0acfe5420599588c559fd85a3a9e8f, with the justification of "being more consistent with the rest of systemd", but I don't see how it's supposed to be so. Originally, when the C code was just a single bootctl.c file, this wasn't so bad. But over time the userspace code grew quite a bit. With the moves done in previuos commits, the intermediate subdirectory is now empty except for the efi/ subdir, and this additional subdirectory level doesn't have a good justification. The components is called "systemd-boot", not "systemd-efi", and we can remove one level of indentation. --- meson.build | 2 +- src/boot/{efi => }/UEFI_SECURITY.md | 0 src/boot/{efi => }/addon.c | 0 src/boot/{efi => }/bcd.c | 0 src/boot/{efi => }/bcd.h | 0 src/boot/{efi => }/boot.c | 0 src/boot/{efi => }/chid.c | 0 src/boot/{efi => }/chid.h | 0 src/boot/{efi => }/console.c | 0 src/boot/{efi => }/console.h | 0 src/boot/{efi => }/cpio.c | 0 src/boot/{efi => }/cpio.h | 0 src/boot/{efi => }/device-path-util.c | 0 src/boot/{efi => }/device-path-util.h | 0 src/boot/{efi => }/devicetree.c | 0 src/boot/{efi => }/devicetree.h | 0 src/boot/{efi => }/drivers.c | 0 src/boot/{efi => }/drivers.h | 0 src/boot/{efi => }/efi-string.c | 0 src/boot/{efi => }/efi-string.h | 0 src/boot/{efi => }/efi.h | 0 src/boot/{efi => }/efivars.c | 0 src/boot/{efi => }/efivars.h | 0 src/boot/{efi => }/export-vars.c | 0 src/boot/{efi => }/export-vars.h | 0 src/boot/{efi => }/fuzz-bcd.c | 0 src/boot/{efi => }/fuzz-efi-osrel.c | 0 src/boot/{efi => }/fuzz-efi-printf.c | 0 src/boot/{efi => }/fuzz-efi-string.c | 0 src/boot/{efi => }/graphics.c | 0 src/boot/{efi => }/graphics.h | 0 src/boot/{efi => }/initrd.c | 0 src/boot/{efi => }/initrd.h | 0 src/boot/{efi => }/linux.c | 0 src/boot/{efi => }/linux.h | 0 src/boot/{efi => }/linux_x86.c | 0 src/boot/{efi => }/log.c | 0 src/boot/{efi => }/log.h | 0 src/boot/{efi => }/measure.c | 0 src/boot/{efi => }/measure.h | 0 src/boot/{efi => }/meson.build | 0 src/boot/{efi => }/part-discovery.c | 0 src/boot/{efi => }/part-discovery.h | 0 src/boot/{efi => }/pe.c | 0 src/boot/{efi => }/pe.h | 0 src/boot/{efi => }/proto/block-io.h | 0 src/boot/{efi => }/proto/cc-measurement.h | 0 src/boot/{efi => }/proto/console-control.h | 0 src/boot/{efi => }/proto/device-path.h | 0 src/boot/{efi => }/proto/dt-fixup.h | 0 src/boot/{efi => }/proto/file-io.h | 0 src/boot/{efi => }/proto/graphics-output.h | 0 src/boot/{efi => }/proto/load-file.h | 0 src/boot/{efi => }/proto/loaded-image.h | 0 src/boot/{efi => }/proto/rng.h | 0 src/boot/{efi => }/proto/security-arch.h | 0 src/boot/{efi => }/proto/shell-parameters.h | 0 src/boot/{efi => }/proto/simple-text-io.h | 0 src/boot/{efi => }/proto/tcg.h | 0 src/boot/{efi => }/random-seed.c | 0 src/boot/{efi => }/random-seed.h | 0 src/boot/{efi => }/secure-boot.c | 0 src/boot/{efi => }/secure-boot.h | 0 src/boot/{efi => }/shim.c | 0 src/boot/{efi => }/shim.h | 0 src/boot/{efi => }/smbios.c | 0 src/boot/{efi => }/smbios.h | 0 src/boot/{efi => }/splash.c | 0 src/boot/{efi => }/splash.h | 0 src/boot/{efi => }/stub.c | 0 src/boot/{efi => }/test-bcd.c | 0 src/boot/{efi => }/test-efi-string.c | 0 src/boot/{efi => }/ticks.c | 0 src/boot/{efi => }/ticks.h | 0 src/boot/{efi => }/ubsan.c | 0 src/boot/{efi => }/util.c | 0 src/boot/{efi => }/util.h | 0 src/boot/{efi => }/vmm.c | 0 src/boot/{efi => }/vmm.h | 0 79 files changed, 1 insertion(+), 1 deletion(-) rename src/boot/{efi => }/UEFI_SECURITY.md (100%) rename src/boot/{efi => }/addon.c (100%) rename src/boot/{efi => }/bcd.c (100%) rename src/boot/{efi => }/bcd.h (100%) rename src/boot/{efi => }/boot.c (100%) rename src/boot/{efi => }/chid.c (100%) rename src/boot/{efi => }/chid.h (100%) rename src/boot/{efi => }/console.c (100%) rename src/boot/{efi => }/console.h (100%) rename src/boot/{efi => }/cpio.c (100%) rename src/boot/{efi => }/cpio.h (100%) rename src/boot/{efi => }/device-path-util.c (100%) rename src/boot/{efi => }/device-path-util.h (100%) rename src/boot/{efi => }/devicetree.c (100%) rename src/boot/{efi => }/devicetree.h (100%) rename src/boot/{efi => }/drivers.c (100%) rename src/boot/{efi => }/drivers.h (100%) rename src/boot/{efi => }/efi-string.c (100%) rename src/boot/{efi => }/efi-string.h (100%) rename src/boot/{efi => }/efi.h (100%) rename src/boot/{efi => }/efivars.c (100%) rename src/boot/{efi => }/efivars.h (100%) rename src/boot/{efi => }/export-vars.c (100%) rename src/boot/{efi => }/export-vars.h (100%) rename src/boot/{efi => }/fuzz-bcd.c (100%) rename src/boot/{efi => }/fuzz-efi-osrel.c (100%) rename src/boot/{efi => }/fuzz-efi-printf.c (100%) rename src/boot/{efi => }/fuzz-efi-string.c (100%) rename src/boot/{efi => }/graphics.c (100%) rename src/boot/{efi => }/graphics.h (100%) rename src/boot/{efi => }/initrd.c (100%) rename src/boot/{efi => }/initrd.h (100%) rename src/boot/{efi => }/linux.c (100%) rename src/boot/{efi => }/linux.h (100%) rename src/boot/{efi => }/linux_x86.c (100%) rename src/boot/{efi => }/log.c (100%) rename src/boot/{efi => }/log.h (100%) rename src/boot/{efi => }/measure.c (100%) rename src/boot/{efi => }/measure.h (100%) rename src/boot/{efi => }/meson.build (100%) rename src/boot/{efi => }/part-discovery.c (100%) rename src/boot/{efi => }/part-discovery.h (100%) rename src/boot/{efi => }/pe.c (100%) rename src/boot/{efi => }/pe.h (100%) rename src/boot/{efi => }/proto/block-io.h (100%) rename src/boot/{efi => }/proto/cc-measurement.h (100%) rename src/boot/{efi => }/proto/console-control.h (100%) rename src/boot/{efi => }/proto/device-path.h (100%) rename src/boot/{efi => }/proto/dt-fixup.h (100%) rename src/boot/{efi => }/proto/file-io.h (100%) rename src/boot/{efi => }/proto/graphics-output.h (100%) rename src/boot/{efi => }/proto/load-file.h (100%) rename src/boot/{efi => }/proto/loaded-image.h (100%) rename src/boot/{efi => }/proto/rng.h (100%) rename src/boot/{efi => }/proto/security-arch.h (100%) rename src/boot/{efi => }/proto/shell-parameters.h (100%) rename src/boot/{efi => }/proto/simple-text-io.h (100%) rename src/boot/{efi => }/proto/tcg.h (100%) rename src/boot/{efi => }/random-seed.c (100%) rename src/boot/{efi => }/random-seed.h (100%) rename src/boot/{efi => }/secure-boot.c (100%) rename src/boot/{efi => }/secure-boot.h (100%) rename src/boot/{efi => }/shim.c (100%) rename src/boot/{efi => }/shim.h (100%) rename src/boot/{efi => }/smbios.c (100%) rename src/boot/{efi => }/smbios.h (100%) rename src/boot/{efi => }/splash.c (100%) rename src/boot/{efi => }/splash.h (100%) rename src/boot/{efi => }/stub.c (100%) rename src/boot/{efi => }/test-bcd.c (100%) rename src/boot/{efi => }/test-efi-string.c (100%) rename src/boot/{efi => }/ticks.c (100%) rename src/boot/{efi => }/ticks.h (100%) rename src/boot/{efi => }/ubsan.c (100%) rename src/boot/{efi => }/util.c (100%) rename src/boot/{efi => }/util.h (100%) rename src/boot/{efi => }/vmm.c (100%) rename src/boot/{efi => }/vmm.h (100%) diff --git a/meson.build b/meson.build index f2b5ce5ea2b..6b62dfa052d 100644 --- a/meson.build +++ b/meson.build @@ -2345,7 +2345,7 @@ subdir('src/backlight') subdir('src/battery-check') subdir('src/binfmt') subdir('src/bless-boot') -subdir('src/boot/efi') +subdir('src/boot') subdir('src/bootctl') subdir('src/busctl') subdir('src/cgls') diff --git a/src/boot/efi/UEFI_SECURITY.md b/src/boot/UEFI_SECURITY.md similarity index 100% rename from src/boot/efi/UEFI_SECURITY.md rename to src/boot/UEFI_SECURITY.md diff --git a/src/boot/efi/addon.c b/src/boot/addon.c similarity index 100% rename from src/boot/efi/addon.c rename to src/boot/addon.c diff --git a/src/boot/efi/bcd.c b/src/boot/bcd.c similarity index 100% rename from src/boot/efi/bcd.c rename to src/boot/bcd.c diff --git a/src/boot/efi/bcd.h b/src/boot/bcd.h similarity index 100% rename from src/boot/efi/bcd.h rename to src/boot/bcd.h diff --git a/src/boot/efi/boot.c b/src/boot/boot.c similarity index 100% rename from src/boot/efi/boot.c rename to src/boot/boot.c diff --git a/src/boot/efi/chid.c b/src/boot/chid.c similarity index 100% rename from src/boot/efi/chid.c rename to src/boot/chid.c diff --git a/src/boot/efi/chid.h b/src/boot/chid.h similarity index 100% rename from src/boot/efi/chid.h rename to src/boot/chid.h diff --git a/src/boot/efi/console.c b/src/boot/console.c similarity index 100% rename from src/boot/efi/console.c rename to src/boot/console.c diff --git a/src/boot/efi/console.h b/src/boot/console.h similarity index 100% rename from src/boot/efi/console.h rename to src/boot/console.h diff --git a/src/boot/efi/cpio.c b/src/boot/cpio.c similarity index 100% rename from src/boot/efi/cpio.c rename to src/boot/cpio.c diff --git a/src/boot/efi/cpio.h b/src/boot/cpio.h similarity index 100% rename from src/boot/efi/cpio.h rename to src/boot/cpio.h diff --git a/src/boot/efi/device-path-util.c b/src/boot/device-path-util.c similarity index 100% rename from src/boot/efi/device-path-util.c rename to src/boot/device-path-util.c diff --git a/src/boot/efi/device-path-util.h b/src/boot/device-path-util.h similarity index 100% rename from src/boot/efi/device-path-util.h rename to src/boot/device-path-util.h diff --git a/src/boot/efi/devicetree.c b/src/boot/devicetree.c similarity index 100% rename from src/boot/efi/devicetree.c rename to src/boot/devicetree.c diff --git a/src/boot/efi/devicetree.h b/src/boot/devicetree.h similarity index 100% rename from src/boot/efi/devicetree.h rename to src/boot/devicetree.h diff --git a/src/boot/efi/drivers.c b/src/boot/drivers.c similarity index 100% rename from src/boot/efi/drivers.c rename to src/boot/drivers.c diff --git a/src/boot/efi/drivers.h b/src/boot/drivers.h similarity index 100% rename from src/boot/efi/drivers.h rename to src/boot/drivers.h diff --git a/src/boot/efi/efi-string.c b/src/boot/efi-string.c similarity index 100% rename from src/boot/efi/efi-string.c rename to src/boot/efi-string.c diff --git a/src/boot/efi/efi-string.h b/src/boot/efi-string.h similarity index 100% rename from src/boot/efi/efi-string.h rename to src/boot/efi-string.h diff --git a/src/boot/efi/efi.h b/src/boot/efi.h similarity index 100% rename from src/boot/efi/efi.h rename to src/boot/efi.h diff --git a/src/boot/efi/efivars.c b/src/boot/efivars.c similarity index 100% rename from src/boot/efi/efivars.c rename to src/boot/efivars.c diff --git a/src/boot/efi/efivars.h b/src/boot/efivars.h similarity index 100% rename from src/boot/efi/efivars.h rename to src/boot/efivars.h diff --git a/src/boot/efi/export-vars.c b/src/boot/export-vars.c similarity index 100% rename from src/boot/efi/export-vars.c rename to src/boot/export-vars.c diff --git a/src/boot/efi/export-vars.h b/src/boot/export-vars.h similarity index 100% rename from src/boot/efi/export-vars.h rename to src/boot/export-vars.h diff --git a/src/boot/efi/fuzz-bcd.c b/src/boot/fuzz-bcd.c similarity index 100% rename from src/boot/efi/fuzz-bcd.c rename to src/boot/fuzz-bcd.c diff --git a/src/boot/efi/fuzz-efi-osrel.c b/src/boot/fuzz-efi-osrel.c similarity index 100% rename from src/boot/efi/fuzz-efi-osrel.c rename to src/boot/fuzz-efi-osrel.c diff --git a/src/boot/efi/fuzz-efi-printf.c b/src/boot/fuzz-efi-printf.c similarity index 100% rename from src/boot/efi/fuzz-efi-printf.c rename to src/boot/fuzz-efi-printf.c diff --git a/src/boot/efi/fuzz-efi-string.c b/src/boot/fuzz-efi-string.c similarity index 100% rename from src/boot/efi/fuzz-efi-string.c rename to src/boot/fuzz-efi-string.c diff --git a/src/boot/efi/graphics.c b/src/boot/graphics.c similarity index 100% rename from src/boot/efi/graphics.c rename to src/boot/graphics.c diff --git a/src/boot/efi/graphics.h b/src/boot/graphics.h similarity index 100% rename from src/boot/efi/graphics.h rename to src/boot/graphics.h diff --git a/src/boot/efi/initrd.c b/src/boot/initrd.c similarity index 100% rename from src/boot/efi/initrd.c rename to src/boot/initrd.c diff --git a/src/boot/efi/initrd.h b/src/boot/initrd.h similarity index 100% rename from src/boot/efi/initrd.h rename to src/boot/initrd.h diff --git a/src/boot/efi/linux.c b/src/boot/linux.c similarity index 100% rename from src/boot/efi/linux.c rename to src/boot/linux.c diff --git a/src/boot/efi/linux.h b/src/boot/linux.h similarity index 100% rename from src/boot/efi/linux.h rename to src/boot/linux.h diff --git a/src/boot/efi/linux_x86.c b/src/boot/linux_x86.c similarity index 100% rename from src/boot/efi/linux_x86.c rename to src/boot/linux_x86.c diff --git a/src/boot/efi/log.c b/src/boot/log.c similarity index 100% rename from src/boot/efi/log.c rename to src/boot/log.c diff --git a/src/boot/efi/log.h b/src/boot/log.h similarity index 100% rename from src/boot/efi/log.h rename to src/boot/log.h diff --git a/src/boot/efi/measure.c b/src/boot/measure.c similarity index 100% rename from src/boot/efi/measure.c rename to src/boot/measure.c diff --git a/src/boot/efi/measure.h b/src/boot/measure.h similarity index 100% rename from src/boot/efi/measure.h rename to src/boot/measure.h diff --git a/src/boot/efi/meson.build b/src/boot/meson.build similarity index 100% rename from src/boot/efi/meson.build rename to src/boot/meson.build diff --git a/src/boot/efi/part-discovery.c b/src/boot/part-discovery.c similarity index 100% rename from src/boot/efi/part-discovery.c rename to src/boot/part-discovery.c diff --git a/src/boot/efi/part-discovery.h b/src/boot/part-discovery.h similarity index 100% rename from src/boot/efi/part-discovery.h rename to src/boot/part-discovery.h diff --git a/src/boot/efi/pe.c b/src/boot/pe.c similarity index 100% rename from src/boot/efi/pe.c rename to src/boot/pe.c diff --git a/src/boot/efi/pe.h b/src/boot/pe.h similarity index 100% rename from src/boot/efi/pe.h rename to src/boot/pe.h diff --git a/src/boot/efi/proto/block-io.h b/src/boot/proto/block-io.h similarity index 100% rename from src/boot/efi/proto/block-io.h rename to src/boot/proto/block-io.h diff --git a/src/boot/efi/proto/cc-measurement.h b/src/boot/proto/cc-measurement.h similarity index 100% rename from src/boot/efi/proto/cc-measurement.h rename to src/boot/proto/cc-measurement.h diff --git a/src/boot/efi/proto/console-control.h b/src/boot/proto/console-control.h similarity index 100% rename from src/boot/efi/proto/console-control.h rename to src/boot/proto/console-control.h diff --git a/src/boot/efi/proto/device-path.h b/src/boot/proto/device-path.h similarity index 100% rename from src/boot/efi/proto/device-path.h rename to src/boot/proto/device-path.h diff --git a/src/boot/efi/proto/dt-fixup.h b/src/boot/proto/dt-fixup.h similarity index 100% rename from src/boot/efi/proto/dt-fixup.h rename to src/boot/proto/dt-fixup.h diff --git a/src/boot/efi/proto/file-io.h b/src/boot/proto/file-io.h similarity index 100% rename from src/boot/efi/proto/file-io.h rename to src/boot/proto/file-io.h diff --git a/src/boot/efi/proto/graphics-output.h b/src/boot/proto/graphics-output.h similarity index 100% rename from src/boot/efi/proto/graphics-output.h rename to src/boot/proto/graphics-output.h diff --git a/src/boot/efi/proto/load-file.h b/src/boot/proto/load-file.h similarity index 100% rename from src/boot/efi/proto/load-file.h rename to src/boot/proto/load-file.h diff --git a/src/boot/efi/proto/loaded-image.h b/src/boot/proto/loaded-image.h similarity index 100% rename from src/boot/efi/proto/loaded-image.h rename to src/boot/proto/loaded-image.h diff --git a/src/boot/efi/proto/rng.h b/src/boot/proto/rng.h similarity index 100% rename from src/boot/efi/proto/rng.h rename to src/boot/proto/rng.h diff --git a/src/boot/efi/proto/security-arch.h b/src/boot/proto/security-arch.h similarity index 100% rename from src/boot/efi/proto/security-arch.h rename to src/boot/proto/security-arch.h diff --git a/src/boot/efi/proto/shell-parameters.h b/src/boot/proto/shell-parameters.h similarity index 100% rename from src/boot/efi/proto/shell-parameters.h rename to src/boot/proto/shell-parameters.h diff --git a/src/boot/efi/proto/simple-text-io.h b/src/boot/proto/simple-text-io.h similarity index 100% rename from src/boot/efi/proto/simple-text-io.h rename to src/boot/proto/simple-text-io.h diff --git a/src/boot/efi/proto/tcg.h b/src/boot/proto/tcg.h similarity index 100% rename from src/boot/efi/proto/tcg.h rename to src/boot/proto/tcg.h diff --git a/src/boot/efi/random-seed.c b/src/boot/random-seed.c similarity index 100% rename from src/boot/efi/random-seed.c rename to src/boot/random-seed.c diff --git a/src/boot/efi/random-seed.h b/src/boot/random-seed.h similarity index 100% rename from src/boot/efi/random-seed.h rename to src/boot/random-seed.h diff --git a/src/boot/efi/secure-boot.c b/src/boot/secure-boot.c similarity index 100% rename from src/boot/efi/secure-boot.c rename to src/boot/secure-boot.c diff --git a/src/boot/efi/secure-boot.h b/src/boot/secure-boot.h similarity index 100% rename from src/boot/efi/secure-boot.h rename to src/boot/secure-boot.h diff --git a/src/boot/efi/shim.c b/src/boot/shim.c similarity index 100% rename from src/boot/efi/shim.c rename to src/boot/shim.c diff --git a/src/boot/efi/shim.h b/src/boot/shim.h similarity index 100% rename from src/boot/efi/shim.h rename to src/boot/shim.h diff --git a/src/boot/efi/smbios.c b/src/boot/smbios.c similarity index 100% rename from src/boot/efi/smbios.c rename to src/boot/smbios.c diff --git a/src/boot/efi/smbios.h b/src/boot/smbios.h similarity index 100% rename from src/boot/efi/smbios.h rename to src/boot/smbios.h diff --git a/src/boot/efi/splash.c b/src/boot/splash.c similarity index 100% rename from src/boot/efi/splash.c rename to src/boot/splash.c diff --git a/src/boot/efi/splash.h b/src/boot/splash.h similarity index 100% rename from src/boot/efi/splash.h rename to src/boot/splash.h diff --git a/src/boot/efi/stub.c b/src/boot/stub.c similarity index 100% rename from src/boot/efi/stub.c rename to src/boot/stub.c diff --git a/src/boot/efi/test-bcd.c b/src/boot/test-bcd.c similarity index 100% rename from src/boot/efi/test-bcd.c rename to src/boot/test-bcd.c diff --git a/src/boot/efi/test-efi-string.c b/src/boot/test-efi-string.c similarity index 100% rename from src/boot/efi/test-efi-string.c rename to src/boot/test-efi-string.c diff --git a/src/boot/efi/ticks.c b/src/boot/ticks.c similarity index 100% rename from src/boot/efi/ticks.c rename to src/boot/ticks.c diff --git a/src/boot/efi/ticks.h b/src/boot/ticks.h similarity index 100% rename from src/boot/efi/ticks.h rename to src/boot/ticks.h diff --git a/src/boot/efi/ubsan.c b/src/boot/ubsan.c similarity index 100% rename from src/boot/efi/ubsan.c rename to src/boot/ubsan.c diff --git a/src/boot/efi/util.c b/src/boot/util.c similarity index 100% rename from src/boot/efi/util.c rename to src/boot/util.c diff --git a/src/boot/efi/util.h b/src/boot/util.h similarity index 100% rename from src/boot/efi/util.h rename to src/boot/util.h diff --git a/src/boot/efi/vmm.c b/src/boot/vmm.c similarity index 100% rename from src/boot/efi/vmm.c rename to src/boot/vmm.c diff --git a/src/boot/efi/vmm.h b/src/boot/vmm.h similarity index 100% rename from src/boot/efi/vmm.h rename to src/boot/vmm.h