shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-07 17:17:44 +03:00
Code

Merge pull request #21960 from medhefgo/boot-gap

Browse Source 
boot: Use objcopy to align sections
This commit is contained in:
Evgeny Vereshchagin 2022-01-03 02:35:15 +03:00 committed by GitHub
commit 019c84938d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_test.sh vendored
View File

@ -132,6 +132,12 @@ for args in "${ARGS[@]}"; do
fatal "'meson compile' failed with $args"
fi
for loader in build/src/boot/efi/*.efi; do
if sbverify --list "$loader" |& grep -q "gap in section table"; then
fatal "$loader: Gaps found in section table"
fi
done
git clean -dxf
success "Build with $args passed in $SECONDS seconds"

1
src/boot/efi/meson.build
View File

@ -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,

2
src/boot/efi/secure-boot.c
View File

@ -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";