diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -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, 2 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog index 08f690e1..1947f746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * debian/copyright: patches should be BSD, like the rest of the upstream 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 diff --git a/debian/patches/binutils-version-matching b/debian/patches/binutils-version-matching deleted file mode 100644 index 0e3bba8b..00000000 --- a/debian/patches/binutils-version-matching +++ /dev/null @@ -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 - diff --git a/debian/patches/series b/debian/patches/series index 8613be11..a5f3392d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ second-stage-path sbsigntool-not-pesign -unused-variable -binutils-version-matching diff --git a/debian/patches/unused-variable b/debian/patches/unused-variable deleted file mode 100644 index b6435ce6..00000000 --- a/debian/patches/unused-variable +++ /dev/null @@ -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; |