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

* debian/patches/unused-variable: dropped; applied upstream.

Browse Source 
* debian/patches/binutils-version-matching: dropped, fixed upstream.
This commit is contained in:
Mathieu Trudel-Lapierre 2016-09-22 10:24:56 -04:00
parent 5998f019f8
commit c2463d3878
4 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release. * New upstream release.
* debian/copyright: patches should be BSD, like the rest of the upstream * debian/copyright: patches should be BSD, like the rest of the upstream
code. code.
* debian/patches/unused-variable: dropped; applied upstream.
* debian/patches/binutils-version-matching: dropped, fixed upstream.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Wed, 21 Sep 2016 20:29:44 -0400 -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Wed, 21 Sep 2016 20:29:44 -0400

26
debian/patches/binutils-version-matching vendored
View File

@ -1,26 +0,0 @@
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Subject: Revert d9a4c912 to fix matching binutils version on Ubuntu.
That commit breaks on Ubuntu as we don't just have "version xyz", but rather
just the version number at the end of the version string, which looks like
this:
"GNU objcopy (GNU Binutils for Ubuntu) 2.26"
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ LD = $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy
ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
-OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.version //g' | cut -f1-2 -d.` \>= 2.24)
+OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.* //g' | cut -f1-2 -d.` \>= 2.24)
SUBDIRS = Cryptlib lib

2
debian/patches/series vendored
View File

@ -1,4 +1,2 @@
second-stage-path second-stage-path
sbsigntool-not-pesign sbsigntool-not-pesign
unused-variable
binutils-version-matching

19
debian/patches/unused-variable vendored
View File

@ -1,19 +0,0 @@
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Subject: Remove unused variable; pointed out by Werror=unused-variable
---
shim.c | 1 -
1 file changed, 1 deletion(-)
Index: b/shim.c
===================================================================
--- a/shim.c
+++ b/shim.c
@@ -1118,7 +1118,6 @@ static EFI_STATUS handle_image (void *da
EFI_STATUS efi_status;
char *buffer;
int i;
- unsigned int size;
EFI_IMAGE_SECTION_HEADER *Section;
char *base, *end;
PE_COFF_LOADER_IMAGE_CONTEXT context;