proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-08-07 16:01:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian/patches/sbsigntool-not-pesign,debian/patches/second-stage-path:

Browse Source 
refreshed.
This commit is contained in:
Mathieu Trudel-Lapierre 2015-05-06 14:02:40 -04:00
parent e42efbd92b
commit 28da53af72
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -4,6 +4,8 @@ shim (0.8-0ubuntu1) UNRELEASED; urgency=medium
* debian/patches/CVE-2014-3675.patch, debian/patches/CVE-2014-3677.patch, * debian/patches/CVE-2014-3675.patch, debian/patches/CVE-2014-3677.patch,
debian/patches/0001-Update-openssl-to-0.9.8za.patch: dropped, included debian/patches/0001-Update-openssl-to-0.9.8za.patch: dropped, included
in the upstream release. in the upstream release.
* debian/patches/sbsigntool-not-pesign,debian/patches/second-stage-path:
refreshed.
-- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 06 May 2015 09:49:45 -0400 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 06 May 2015 09:49:45 -0400

14
debian/patches/sbsigntool-not-pesign vendored
View File

@ -5,13 +5,17 @@ Description: Sign MokManager with sbsigntool instead of pesign
Author: Steve Langasek <steve.langasek@canonical.com> Author: Steve Langasek <steve.langasek@canonical.com>
Forwarded: not-needed Forwarded: not-needed
Index: shim/Makefile ---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: b/Makefile
=================================================================== ===================================================================
--- shim.orig/Makefile --- a/Makefile
+++ shim/Makefile +++ b/Makefile
@@ -88,8 +88,8 @@ @@ -144,8 +144,8 @@ FORMAT ?= --target efi-app-$(ARCH)
-j .debug_line -j .debug_str -j .debug_ranges \ -j .debug_line -j .debug_str -j .debug_ranges \
--target=efi-app-$(ARCH) $^ $@.debug $(FORMAT) $^ $@.debug
-%.efi.signed: %.efi certdb/secmod.db -%.efi.signed: %.efi certdb/secmod.db
- pesign -n certdb -i $< -c "shim" -s -o $@ -f - pesign -n certdb -i $< -c "shim" -s -o $@ -f

16
debian/patches/second-stage-path vendored
View File

@ -5,16 +5,20 @@ Description: Chainload grubx64.efi, not grub.efi
anyway, not grub.efi.) anyway, not grub.efi.)
Author: Steve Langasek <steve.langasek@ubuntu.com> Author: Steve Langasek <steve.langasek@ubuntu.com>
Index: shim/Makefile ---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/Makefile
=================================================================== ===================================================================
--- shim.orig/Makefile --- a/Makefile
+++ shim/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ @@ -18,7 +18,7 @@ EFI_LIBS = -lefi -lgnuefi --start-group
EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o
EFI_LDS = elf_$(ARCH)_efi.lds EFI_LDS = elf_$(ARCH)_efi.lds
-DEFAULT_LOADER := \\\\grub.efi -DEFAULT_LOADER := \\\\grub.efi
+DEFAULT_LOADER := \\\\grubx64.efi +DEFAULT_LOADER := \\\\grubx64.efi
CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \ CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
-fshort-wchar -Wall -Werror -mno-red-zone -maccumulate-outgoing-args \ -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \
-mno-mmx -mno-sse -fno-builtin \ -Werror=sign-compare \