templates/EFI: use files from Ubuntu 18.04

Currently, the shim cannot be loaded with TianoCore (using
/usr/share/edk2.git/ovmf-x64/OVMF-pure-efi.fd from
https://www.kraxel.org/repos/jenkins/edk2/edk2.git-ovmf-x64-0-20180508.84.g7cd8a57599.noarch.rpm)
and also fails on several systems like on the Dell XPS 13 9360 and 9370,
Dell r640 (see http://ml.grml.org/pipermail/grml/2018-May/011734.html)
and HP EliteBook 820 G3.

Error message during boot:

| Reloc 0 block size 2756420659 is invalid
| Relocation failed: Unsupported

diff --git a/templates/EFI/BOOT/README b/templates/EFI/BOOT/README
index 41ad10f..374774f 100644 (file)
--- a/templates/EFI/BOOT/README
+++ b/templates/EFI/BOOT/README
@@ -1,3 +1,3 @@
 # ubuntu approach:
 # ubuntu approach:

-shimx64.efi.signed = /usr/lib/shim/shimx64.efi.signed                   from http://de.archive.ubuntu.com/ubuntu/pool/main/s/shim-signed/shim-signed_1.32~17.04.1+0.9+1474479173.6c180c6-1ubuntu1_amd64.deb
-grubx64.efi.signed = /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed from http://de.archive.ubuntu.com/ubuntu/pool/main/g/grub2-signed/grub-efi-amd64-signed_1.80.2+2.02~beta3-4ubuntu2.2_amd64.deb
+shimx64.efi.signed = /usr/lib/shim/shimx64.efi.signed                   from http://de.archive.ubuntu.com/ubuntu/pool/main/s/shim-signed/shim-signed_1.34.9+13-0ubuntu2_amd64.deb
+grubx64.efi.signed = /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed from http://de.archive.ubuntu.com/ubuntu/pool/main/g/grub2-signed/grub-efi-amd64-signed_1.93+2.02-2ubuntu8_amd64.deb

diff --git a/templates/EFI/BOOT/grubx64.efi.signed b/templates/EFI/BOOT/grubx64.efi.signed
index d7d2117..d502e5f 100644 (file)
Binary files a/templates/EFI/BOOT/grubx64.efi.signed and b/templates/EFI/BOOT/grubx64.efi.signed differ

diff --git a/templates/EFI/BOOT/shimx64.efi.signed b/templates/EFI/BOOT/shimx64.efi.signed
index 9943e7a..d9f3214 100644 (file)
Binary files a/templates/EFI/BOOT/shimx64.efi.signed and b/templates/EFI/BOOT/shimx64.efi.signed differ