|
@@ -0,0 +1,51 @@
|
|
|
+From a542b169003c2ef95ce6c00d40050eb10568b612 Mon Sep 17 00:00:00 2001
|
|
|
+From: Peter Jones <pjones@redhat.com>
|
|
|
+Date: Mon, 6 Feb 2017 16:34:54 -0500
|
|
|
+Subject: [PATCH] Remove extra const keywords gcc 7 gripes about.
|
|
|
+
|
|
|
+Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
+[Backported from upstream commit a542b169003c2ef95ce6c00d40050eb10568b612]
|
|
|
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
+---
|
|
|
+ src/efibootdump.c | 2 +-
|
|
|
+ src/efibootmgr.c | 4 ++--
|
|
|
+ 2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
+
|
|
|
+diff --git a/src/efibootdump.c b/src/efibootdump.c
|
|
|
+index 6ff8360..30a1943 100644
|
|
|
+--- a/src/efibootdump.c
|
|
|
++++ b/src/efibootdump.c
|
|
|
+@@ -39,7 +39,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size)
|
|
|
+ uint8_t *optional_data = NULL;
|
|
|
+ size_t optional_data_len = 0;
|
|
|
+ uint16_t pathlen;
|
|
|
+- const unsigned char const *desc;
|
|
|
++ const unsigned char *desc;
|
|
|
+ char *raw;
|
|
|
+ size_t raw_len;
|
|
|
+
|
|
|
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
|
|
|
+index 493f2cf..90a0998 100644
|
|
|
+--- a/src/efibootmgr.c
|
|
|
++++ b/src/efibootmgr.c
|
|
|
+@@ -221,7 +221,7 @@ warn_duplicate_name(list_t *var_list)
|
|
|
+ list_t *pos;
|
|
|
+ var_entry_t *entry;
|
|
|
+ efi_load_option *load_option;
|
|
|
+- const unsigned char const *desc;
|
|
|
++ const unsigned char *desc;
|
|
|
+
|
|
|
+ list_for_each(pos, var_list) {
|
|
|
+ entry = list_entry(pos, var_entry_t, list);
|
|
|
+@@ -873,7 +873,7 @@ show_vars(const char *prefix)
|
|
|
+ {
|
|
|
+ list_t *pos;
|
|
|
+ var_entry_t *boot;
|
|
|
+- const unsigned char const *description;
|
|
|
++ const unsigned char *description;
|
|
|
+ efi_load_option *load_option;
|
|
|
+ efidp dp = NULL;
|
|
|
+ unsigned char *optional_data = NULL;
|
|
|
+--
|
|
|
+2.9.4
|
|
|
+
|