summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lin <glin@suse.com>2021-03-17 15:44:38 +0800
committerPeter Jones <pjones@redhat.com>2021-03-18 22:47:38 -0400
commit0ff04b2ff2bc2c5ebe6bbb97aa89fb7ae8c318ac (patch)
tree21dc0188309c7040a5b45ce31ba16e27b17c53f8
parent7defee6ad60d16dc762c110f67ec9074cbb4039a (diff)
downloadefi-boot-shim-0ff04b2ff2bc2c5ebe6bbb97aa89fb7ae8c318ac.tar.gz
efi-boot-shim-0ff04b2ff2bc2c5ebe6bbb97aa89fb7ae8c318ac.zip
arm and aarch64: include the aligned part in SizeOfRawData of sbat
Similar to x86_64, the .sbat section is aligned to 4096, so we should include the aligned part in SizeOfRawData as objcopy does for x86_64. For VirtualSize, _sbat_vsize is used to reflect the actually size of sbat. This also fixes a strange hash mismatching in openSUSE build service when attaching signature to AArch64 EFI images from shim package. Signed-off-by: Gary Lin <glin@suse.com>
-rw-r--r--elf_aarch64_efi.lds2
-rw-r--r--elf_arm_efi.lds2
m---------gnu-efi0
3 files changed, 4 insertions, 0 deletions
diff --git a/elf_aarch64_efi.lds b/elf_aarch64_efi.lds
index 70cc9588..feb4ead9 100644
--- a/elf_aarch64_efi.lds
+++ b/elf_aarch64_efi.lds
@@ -76,6 +76,8 @@ SECTIONS
*(.sbat.*)
}
_esbat = .;
+ _sbat_vsize = . - _sbat;
+ . = ALIGN(4096);
_sbat_size = . - _sbat;
_alldata_size = . - _data;
diff --git a/elf_arm_efi.lds b/elf_arm_efi.lds
index fa7512be..d7de181f 100644
--- a/elf_arm_efi.lds
+++ b/elf_arm_efi.lds
@@ -74,6 +74,8 @@ SECTIONS
*(.sbat.*)
}
_esbat = .;
+ _sbat_vsize = . - _sbat;
+ . = ALIGN(4096);
_sbat_size = . - _sbat;
_alldata_size = . - _data;
diff --git a/gnu-efi b/gnu-efi
-Subproject e32d8c84a5748a2e3b7220dae638418f81a7986
+Subproject 5e07f70b08776e72fa1d081af56b8d5e636433c