Add one more patch from upstream to fix i386 binary relocations

This commit is contained in:
Steve McIntyre 2021-03-31 20:51:26 +01:00
parent a42e843a73
commit f81081d61b
3 changed files with 29 additions and 0 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ shim (15.4-1) unstable; urgency=medium
* Print sha256 checksums of the EFI binaries when the build is done, * Print sha256 checksums of the EFI binaries when the build is done,
for easier comparison between builds. for easier comparison between builds.
* Override dh_auto_build setting INSTALL, cut down on build noise. * Override dh_auto_build setting INSTALL, cut down on build noise.
* Add one more patch from upstream to fix i386 binary relocations
-- Steve McIntyre <93sam@debian.org> Wed, 31 Mar 2021 18:25:00 +0100 -- Steve McIntyre <93sam@debian.org> Wed, 31 Mar 2021 18:25:00 +0100

View File

@ -0,0 +1,27 @@
commit 1bea91ba72165d97c3b453cf769cb4bc5c07207a
Author: Peter Jones <pjones@redhat.com>
Date: Wed Mar 31 14:54:52 2021 -0400
Fix a broken file header on ia32
Commit c6281c6a195edee61185 needs to have included a ". = ALIGN(4096)"
directive before .reloc, but fails to do so.
As a result, binutils, which does not care about the actual binary
format's constraints in any way, does not enforce the section alignment,
and it will not load.
Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/elf_ia32_efi.lds b/elf_ia32_efi.lds
index 742e0a47..497a3a15 100644
--- a/elf_ia32_efi.lds
+++ b/elf_ia32_efi.lds
@@ -15,6 +15,7 @@ SECTIONS
*(.gnu.linkonce.t.*)
_etext = .;
}
+ . = ALIGN(4096);
.reloc :
{
*(.reloc)

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
fix-broken-ia32-reloc.patch