From: Jan Janssen <medhefgo@web.de>
Date: Sat, 1 Jan 2022 15:37:27 +0000 (+0100)
Subject: boot: Use objcopy to align sections
X-Git-Tag: v251-rc1~613^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75747c8a399967fa5d815a8f70f724436d035652;p=thirdparty%2Fsystemd.git

boot: Use objcopy to align sections

Not aligning these can create gaps in the section table. Some
firmware does not handle this nicely resulting in secure boot
signature fails.
Using objcopy ensures that any new sections in the future will be
properly aligned.

Fixes: #21956
---

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index ab970001e4d..8587b11cd6b 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -405,6 +405,7 @@ foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects
                            '-j', '.sdata',
                            '-j', '.sdmagic',
                            '-j', '.text',
+                           '--section-alignment=512',
                            efi_format,
                            '@INPUT@', '@OUTPUT@'],
                 install : true,
diff --git a/src/boot/efi/secure-boot.c b/src/boot/efi/secure-boot.c
index efea1457195..ab2d256031a 100644
--- a/src/boot/efi/secure-boot.c
+++ b/src/boot/efi/secure-boot.c
@@ -30,7 +30,7 @@ SecureBootMode secure_boot_mode(void) {
 }
 
 #ifdef SBAT_DISTRO
-static const char sbat[] _used_ _section_ (".sbat") _align_ (512) =
+static const char sbat[] _used_ _section_(".sbat") =
         "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md\n"
         SBAT_PROJECT ",1,The systemd Developers," SBAT_PROJECT "," PROJECT_VERSION "," PROJECT_URL "\n"
         SBAT_PROJECT "." SBAT_DISTRO "," STRINGIFY(SBAT_DISTRO_GENERATION) "," SBAT_DISTRO_SUMMARY "," SBAT_DISTRO_PKGNAME "," SBAT_DISTRO_VERSION "," SBAT_DISTRO_URL "\n";