efibootmgr: fix conflicting types for 'efi_set_verbose'

Since upstream efivar-37 pulibc efi_set_verbose in its
headers [daf3b6c Move verbosity headers to be public],
it is not necessary to delcare in efibootmgr.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-12-18 15:38:42 +08:00
committed by Khem Raj
parent 5dafdbc58e
commit 9ff2a0bf6f
2 changed files with 32 additions and 0 deletions
@@ -12,6 +12,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
SRCREV = "e067160ecef8208e1944002e5d50b275733211fb" SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"
SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \
file://0001-remove-extra-decl.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -0,0 +1,31 @@
From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 13 Jun 2018 09:41:01 -0400
Subject: [PATCH] remove extra decl
Signed-off-by: Peter Jones <pjones@redhat.com>
Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
src/efibootmgr.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
index de38f01..4e1a680 100644
--- a/src/efibootmgr.c
+++ b/src/efibootmgr.c
@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
"invalid numeric value %s\n",
optarg);
}
- /* XXX efivar-36 accidentally doesn't have a public
- * header for this */
- extern int efi_set_verbose(int verbosity, FILE *errlog);
efi_set_verbose(opts.verbose - 2, stderr);
break;
case 'V':
--
2.7.4