diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2016-07-26 14:37:29 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2016-07-26 14:37:29 -0400 |
| commit | 7fbc200d477efc39342f465c9308e0bd9194262b (patch) | |
| tree | 901a5dc74e44f148cbd6954eb092275274e8bdc1 /debian | |
| parent | d191cf2c9e3da08479d2c7be84d8305991aa1b16 (diff) | |
| download | efi-boot-shim-7fbc200d477efc39342f465c9308e0bd9194262b.tar.gz efi-boot-shim-7fbc200d477efc39342f465c9308e0bd9194262b.zip | |
* debian/patches/unused-variable: remove unused variable size.
* debian/patches/binutils-version-matching: revert d9a4c912 to correctly
match objcopy's version on Ubuntu.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/binutils-version-matching | 26 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/unused-variable | 19 |
4 files changed, 50 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e90f3a33..554d602c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ shim (0.9+1465500757.14a5905-0ubuntu1) UNRELEASED; urgency=medium - Remaining patches: + second-stage-path + sbsigntool-not-pesign + * debian/patches/unused-variable: remove unused variable size. + * debian/patches/binutils-version-matching: revert d9a4c912 to correctly + match objcopy's version on Ubuntu. -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Tue, 26 Jul 2016 12:02:21 -0400 diff --git a/debian/patches/binutils-version-matching b/debian/patches/binutils-version-matching new file mode 100644 index 00000000..0e3bba8b --- /dev/null +++ b/debian/patches/binutils-version-matching @@ -0,0 +1,26 @@ +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 + diff --git a/debian/patches/series b/debian/patches/series index a5f3392d..8613be11 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ second-stage-path sbsigntool-not-pesign +unused-variable +binutils-version-matching diff --git a/debian/patches/unused-variable b/debian/patches/unused-variable new file mode 100644 index 00000000..b6435ce6 --- /dev/null +++ b/debian/patches/unused-variable @@ -0,0 +1,19 @@ +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; |