package/efibootmgr: bump to version 18

Drop patches which are already applied upstream.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2022.11.x
Erico Nunes 2022-10-04 16:39:43 +02:00 committed by Thomas Petazzoni
parent f24029b561
commit 5d52814f60
4 changed files with 2 additions and 70 deletions

View File

@ -1,40 +0,0 @@
From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Fri, 25 Nov 2016 20:26:52 +0200
Subject: [PATCH] Remove unneeded <uchar.h> include
This fixes the build with uClibc.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
src/efibootdump.c | 1 -
src/eficonman.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/efibootdump.c b/src/efibootdump.c
index 6ff8360..7c5a1c5 100644
--- a/src/efibootdump.c
+++ b/src/efibootdump.c
@@ -19,7 +19,6 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <uchar.h>
#include <unistd.h>
#include "error.h"
diff --git a/src/eficonman.c b/src/eficonman.c
index 2c2be38..9bfae79 100644
--- a/src/eficonman.c
+++ b/src/eficonman.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <uchar.h>
#include <unistd.h>
#define _(String) gettext (String)
--
2.10.2

View File

@ -1,28 +0,0 @@
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
Downloaded from upstream commit
https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad
Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
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':

View File

@ -1,3 +1,3 @@
# locally computed hash
sha256 22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d efibootmgr-17.tar.gz
sha256 442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874 efibootmgr-18.tar.gz
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
EFIBOOTMGR_VERSION = 17
EFIBOOTMGR_VERSION = 18
EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION))
EFIBOOTMGR_LICENSE = GPL-2.0+
EFIBOOTMGR_LICENSE_FILES = COPYING