diff --git a/debian/changelog b/debian/changelog index f405cc4..087dc94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fwupd (1.5.7-2) UNRELEASED; urgency=medium + + * Backport a patch to fix FTBFS on armhf for SBAT + + -- Mario Limonciello Tue, 23 Feb 2021 16:43:15 -0600 + fwupd (1.5.7-1) unstable; urgency=medium * New upstream version (1.5.7) diff --git a/debian/patches/0001-trivial-add-linker-script-for-armhf.patch b/debian/patches/0001-trivial-add-linker-script-for-armhf.patch new file mode 100644 index 0000000..2e40df2 --- /dev/null +++ b/debian/patches/0001-trivial-add-linker-script-for-armhf.patch @@ -0,0 +1,94 @@ +From f699fae1a354432468c1835fc6978cdb6e641ae6 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Tue, 23 Feb 2021 16:41:30 -0600 +Subject: [PATCH] trivial: add linker script for armhf + +fixes FTBFS in Debian: +https://buildd.debian.org/status/fetch.php?pkg=fwupd&arch=armhf&ver=1.5.7-1&stamp=1614100547&raw=0 +--- + plugins/uefi-capsule/efi/lds/elf_arm_efi.lds | 73 ++++++++++++++++++++ + 1 file changed, 73 insertions(+) + create mode 100644 plugins/uefi-capsule/efi/lds/elf_arm_efi.lds + +diff --git a/plugins/uefi-capsule/efi/lds/elf_arm_efi.lds b/plugins/uefi-capsule/efi/lds/elf_arm_efi.lds +new file mode 100644 +index 00000000..80cce416 +--- /dev/null ++++ b/plugins/uefi-capsule/efi/lds/elf_arm_efi.lds +@@ -0,0 +1,73 @@ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ .text 0x0 : { ++ _text = .; ++ *(.text.head) ++ *(.text) ++ *(.text.*) ++ *(.gnu.linkonce.t.*) ++ *(.srodata) ++ *(.rodata*) ++ . = ALIGN(16); ++ } ++ _etext = .; ++ _text_size = . - _text; ++ .dynamic : { *(.dynamic) } ++ .data : ++ { ++ _data = .; ++ *(.sdata) ++ *(.data) ++ *(.data1) ++ *(.data.*) ++ *(.got.plt) ++ *(.got) ++ ++ /* the EFI loader doesn't seem to like a .bss section, so we stick ++ it all into .data: */ ++ . = ALIGN(16); ++ _bss = .; ++ *(.sbss) ++ *(.scommon) ++ *(.dynbss) ++ *(.bss) ++ *(.bss.*) ++ *(COMMON) ++ . = ALIGN(16); ++ _bss_end = .; ++ } ++ ++ . = ALIGN(4096); ++ .sbat : ++ { ++ _sbat = .; ++ *(.sbat) ++ *(.sbat.*) ++ _esbat = .; ++ } ++ ++ . = ALIGN(4096); ++ .rel.dyn : { *(.rel.dyn) } ++ .rel.plt : { *(.rel.plt) } ++ .rel.got : { *(.rel.got) } ++ .rel.data : { *(.rel.data) *(.rel.data*) } ++ _edata = .; ++ _data_size = . - _etext; ++ ++ . = ALIGN(4096); ++ .dynsym : { *(.dynsym) } ++ . = ALIGN(4096); ++ .dynstr : { *(.dynstr) } ++ . = ALIGN(4096); ++ .note.gnu.build-id : { *(.note.gnu.build-id) } ++ /DISCARD/ : ++ { ++ *(.rel.reloc) ++ *(.eh_frame) ++ *(.note.GNU-stack) ++ } ++ .comment 0 : { *(.comment) } ++} +-- +2.25.1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..efd016a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-trivial-add-linker-script-for-armhf.patch