summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-29 16:48:15 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-29 16:59:49 +0200
commit09881fb903a89241ef20f0601f0fb6d2d9a175d5 (patch)
tree2815fec1631de476f1fd725507e8abe2126a8283
parentc17e0ee179f7ea34c02952338ac50712e1844c50 (diff)
downloadhardware-09881fb903a89241ef20f0601f0fb6d2d9a175d5.tar.gz
hardware-09881fb903a89241ef20f0601f0fb6d2d9a175d5.tar.xz
fwupdate: version bump to 9
Change-Id: I1888449cdf358192e3807cf201bc8eecc394503a Reviewed-on: https://galileo.mailstation.de/gerrit/9154 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/sys-apps/fwupdate/files/2fe9e690e019d2e25db3be22b57623c0618148d7.patch34
-rw-r--r--packages/sys-apps/fwupdate/files/ac568afd71540aca7849a295e4746e5c742b116e.patch68
-rw-r--r--packages/sys-apps/fwupdate/files/affc219a5bac93cb6e774879c874c203f755ba11.patch45
-rw-r--r--packages/sys-apps/fwupdate/fwupdate-9.exheres-0 (renamed from packages/sys-apps/fwupdate/fwupdate-8.exheres-0)3
4 files changed, 150 insertions, 0 deletions
diff --git a/packages/sys-apps/fwupdate/files/2fe9e690e019d2e25db3be22b57623c0618148d7.patch b/packages/sys-apps/fwupdate/files/2fe9e690e019d2e25db3be22b57623c0618148d7.patch
new file mode 100644
index 0000000..5238b99
--- /dev/null
+++ b/packages/sys-apps/fwupdate/files/2fe9e690e019d2e25db3be22b57623c0618148d7.patch
@@ -0,0 +1,34 @@
+From 2fe9e690e019d2e25db3be22b57623c0618148d7 Mon Sep 17 00:00:00 2001
+From: Mirco Tischler <mt-ml@gmx.de>
+Date: Mon, 6 Mar 2017 23:45:46 +0100
+Subject: [PATCH] Fix uninitialized variable.
+
+If boot_order_size is 0, i was never set. On gcc-6.3.1, this broke the
+build if compiled with -O2 (-Werror=maybe_uninitialized). This is the
+error:
+
+libfwup.c: In function 'set_up_boot_next':
+libfwup.c:818:16: error: 'i' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ new_boot_order[i] = boot_entry;
+ ^
+libfwup.c:780:15: note: 'i' was declared here
+ unsigned int i;
+ ^
+cc1: all warnings being treated as errors
+---
+ linux/libfwup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/libfwup.c b/linux/libfwup.c
+index 232eb77..30cf56a 100644
+--- a/linux/libfwup.c
++++ b/linux/libfwup.c
+@@ -790,7 +790,7 @@ add_to_boot_order(uint16_t boot_entry)
+ EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ EFI_VARIABLE_RUNTIME_ACCESS;
+ int rc;
+- unsigned int i;
++ unsigned int i = 0;
+
+ rc = efi_get_variable_size(efi_guid_global, "BootOrder",
+ &boot_order_size);
diff --git a/packages/sys-apps/fwupdate/files/ac568afd71540aca7849a295e4746e5c742b116e.patch b/packages/sys-apps/fwupdate/files/ac568afd71540aca7849a295e4746e5c742b116e.patch
new file mode 100644
index 0000000..3cc305b
--- /dev/null
+++ b/packages/sys-apps/fwupdate/files/ac568afd71540aca7849a295e4746e5c742b116e.patch
@@ -0,0 +1,68 @@
+From ac568afd71540aca7849a295e4746e5c742b116e Mon Sep 17 00:00:00 2001
+From: Raymund Will <rw@suse.com>
+Date: Mon, 13 Mar 2017 14:35:41 +0100
+Subject: [PATCH] Hide empty strings from xgettext
+
+This avoids those
+
+warning: Empty msgid. It is reserved by GNU gettext:
+ gettext("") returns the header entry with
+ meta information, not the empty string.
+
+messages while processing linux/fwupdate.c:91, linux/libfwup.c:51,
+and linux/libfwup.c:62. (Is there a better term for "" than EMPTY?)
+
+Signed-off-by: Raymund Will <rw@suse.com>
+---
+ linux/fwupdate.c | 2 +-
+ linux/libfwup.c | 4 ++--
+ linux/util.h | 1 +
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/linux/fwupdate.c b/linux/fwupdate.c
+index 3414e0b..eaf07be 100644
+--- a/linux/fwupdate.c
++++ b/linux/fwupdate.c
+@@ -88,7 +88,7 @@ main(int argc, char *argv[]) {
+
+ efi_guid_t guid;
+
+- setlocale(LC_ALL, "");
++ setlocale(LC_ALL, EMPTY);
+ bindtextdomain("fwupdate", LOCALEDIR);
+ textdomain("fwupdate");
+
+diff --git a/linux/libfwup.c b/linux/libfwup.c
+index 30cf56a..4c9b7c8 100644
+--- a/linux/libfwup.c
++++ b/linux/libfwup.c
+@@ -48,7 +48,7 @@ static char *arch_names_32[] = {
+ #if defined(__x86_64__) || defined(__i386__) || defined(__i686__)
+ "ia32",
+ #endif
+- ""
++ EMPTY
+ };
+
+ static int n_arches_32 = sizeof(arch_names_32) / sizeof(arch_names_32[0]);
+@@ -59,7 +59,7 @@ static char *arch_names_64[] = {
+ #elif defined(__aarch64__)
+ "aa64",
+ #endif
+- ""
++ EMPTY
+ };
+
+ static int n_arches_64 = sizeof(arch_names_64) / sizeof(arch_names_64[0]);
+diff --git a/linux/util.h b/linux/util.h
+index 23fd7cd..af67624 100644
+--- a/linux/util.h
++++ b/linux/util.h
+@@ -22,6 +22,7 @@
+ #define N_(String) (String)
+ #define C_(Context,String) dgettext (Context,String)
+ #define NC_(Context, String) (String)
++#define EMPTY ""
+
+ extern int quiet;
+
diff --git a/packages/sys-apps/fwupdate/files/affc219a5bac93cb6e774879c874c203f755ba11.patch b/packages/sys-apps/fwupdate/files/affc219a5bac93cb6e774879c874c203f755ba11.patch
new file mode 100644
index 0000000..d414623
--- /dev/null
+++ b/packages/sys-apps/fwupdate/files/affc219a5bac93cb6e774879c874c203f755ba11.patch
@@ -0,0 +1,45 @@
+From affc219a5bac93cb6e774879c874c203f755ba11 Mon Sep 17 00:00:00 2001
+From: Raymund Will <rw@suse.com>
+Date: Mon, 13 Mar 2017 12:57:07 +0100
+Subject: [PATCH] Fix regression in "objcopy version check" (AKA `expr: syntax
+ error`)
+
+While commit 8418fee4 may have fixed the check for "some distributions"
+it broke the same check for others, like
+
+`GNU objcopy (WinAVR 20090313) 2.19`
+`GNU objcopy (AVR_8_bit_GNU_Toolchain_3.4.3_1072) 2.23.2`
+`GNU objcopy (Codescape GNU Tools 2016.05-03 for MIPS MTI Bare Metal) 2.24.90`
+`GNU objcopy (GNU Binutils; openSUSE Leap 42.2) 2.26.1`
+`GNU objcopy (GNU Binutils; SUSE Linux Enterprise 12) 2.26.1`
+
+(some more, some less relevant... ;)
+
+This version is meant to cover them all (or at least be easily extensible).
+
+Signed-off-by: Raymund Will <rw@suse.com>
+---
+ efi/Makefile | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/efi/Makefile b/efi/Makefile
+index 920c096..faf8ee2 100644
+--- a/efi/Makefile
++++ b/efi/Makefile
+@@ -15,7 +15,15 @@ CCLDFLAGS ?= -nostdlib -Wl,--warn-common \
+ -Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \
+ -Wl,--build-id=sha1 -Wl,--hash-style=sysv \
+ $(GNUEFIDIR)/crt0-efi-$(ARCH).o
+-OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24)
++
++define objcopy_version =
++ $(OBJCOPY) --version |
++ sed -e '/^GNU objcopy/! d;
++ : loop1; s/([^)(]*)//g; t loop1;
++ : loop2; s/\[[^][]*\]//g; t loop2;
++ s/.* \([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;'
++endef
++OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24)
+
+ FWUP = fwupdate
+
diff --git a/packages/sys-apps/fwupdate/fwupdate-8.exheres-0 b/packages/sys-apps/fwupdate/fwupdate-9.exheres-0
index b97fe09..b73e88e 100644
--- a/packages/sys-apps/fwupdate/fwupdate-8.exheres-0
+++ b/packages/sys-apps/fwupdate/fwupdate-9.exheres-0
@@ -21,6 +21,9 @@ DEPENDENCIES="
"
DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/ac568afd71540aca7849a295e4746e5c742b116e.patch
+ "${FILES}"/affc219a5bac93cb6e774879c874c203f755ba11.patch
+ "${FILES}"/2fe9e690e019d2e25db3be22b57623c0618148d7.patch
"${FILES}"/${PN}-8-pkgconfig.patch
)