buildroot.busybox.net archive mirror
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/efibootmgr: bump to version 18
@ 2022-09-27 10:58 Erico Nunes
  2022-10-01 20:54 ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Erico Nunes @ 2022-09-27 10:58 UTC (permalink / raw)
  To: buildroot

Drop patches which are already applied upstream.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
---
 .../0001-Allow-build-with-uClibc.patch        | 40 -------------------
 .../efibootmgr/0002-remove-extra-decl.patch   | 28 -------------
 package/efibootmgr/efibootmgr.hash            |  2 +-
 package/efibootmgr/efibootmgr.mk              |  2 +-
 4 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 package/efibootmgr/0001-Allow-build-with-uClibc.patch
 delete mode 100644 package/efibootmgr/0002-remove-extra-decl.patch

diff --git a/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/package/efibootmgr/0001-Allow-build-with-uClibc.patch
deleted file mode 100644
index fd29233dc3..0000000000
--- a/package/efibootmgr/0001-Allow-build-with-uClibc.patch
+++ /dev/null
@@ -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
-
diff --git a/package/efibootmgr/0002-remove-extra-decl.patch b/package/efibootmgr/0002-remove-extra-decl.patch
deleted file mode 100644
index f838d50a20..0000000000
--- a/package/efibootmgr/0002-remove-extra-decl.patch
+++ /dev/null
@@ -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':
diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash
index fdbc9a2732..71a9826331 100644
--- a/package/efibootmgr/efibootmgr.hash
+++ b/package/efibootmgr/efibootmgr.hash
@@ -1,3 +1,3 @@
 # locally computed hash
-sha256  22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d  efibootmgr-17.tar.gz
+sha256  442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874  efibootmgr-18.tar.gz
 sha256  dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk
index 7e09b5f659..672a93c282 100644
--- a/package/efibootmgr/efibootmgr.mk
+++ b/package/efibootmgr/efibootmgr.mk
@@ -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
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/efibootmgr: bump to version 18
  2022-09-27 10:58 [Buildroot] [PATCH] package/efibootmgr: bump to version 18 Erico Nunes
@ 2022-10-01 20:54 ` Yann E. MORIN
  2022-10-03  8:05   ` Erico Nunes
  0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2022-10-01 20:54 UTC (permalink / raw)
  To: Erico Nunes; +Cc: buildroot

Erico, All,

On 2022-09-27 12:58 +0200, Erico Nunes spake thusly:
> Drop patches which are already applied upstream.
> 
> Signed-off-by: Erico Nunes <nunes.erico@gmail.com>

Does this change depend on the efivar bump, or can it be applied
independently?

Regards,
Yann E. MORIN.

> ---
>  .../0001-Allow-build-with-uClibc.patch        | 40 -------------------
>  .../efibootmgr/0002-remove-extra-decl.patch   | 28 -------------
>  package/efibootmgr/efibootmgr.hash            |  2 +-
>  package/efibootmgr/efibootmgr.mk              |  2 +-
>  4 files changed, 2 insertions(+), 70 deletions(-)
>  delete mode 100644 package/efibootmgr/0001-Allow-build-with-uClibc.patch
>  delete mode 100644 package/efibootmgr/0002-remove-extra-decl.patch
> 
> diff --git a/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/package/efibootmgr/0001-Allow-build-with-uClibc.patch
> deleted file mode 100644
> index fd29233dc3..0000000000
> --- a/package/efibootmgr/0001-Allow-build-with-uClibc.patch
> +++ /dev/null
> @@ -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
> -
> diff --git a/package/efibootmgr/0002-remove-extra-decl.patch b/package/efibootmgr/0002-remove-extra-decl.patch
> deleted file mode 100644
> index f838d50a20..0000000000
> --- a/package/efibootmgr/0002-remove-extra-decl.patch
> +++ /dev/null
> @@ -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':
> diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash
> index fdbc9a2732..71a9826331 100644
> --- a/package/efibootmgr/efibootmgr.hash
> +++ b/package/efibootmgr/efibootmgr.hash
> @@ -1,3 +1,3 @@
>  # locally computed hash
> -sha256  22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d  efibootmgr-17.tar.gz
> +sha256  442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874  efibootmgr-18.tar.gz
>  sha256  dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
> diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk
> index 7e09b5f659..672a93c282 100644
> --- a/package/efibootmgr/efibootmgr.mk
> +++ b/package/efibootmgr/efibootmgr.mk
> @@ -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
> -- 
> 2.37.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/efibootmgr: bump to version 18
  2022-10-01 20:54 ` Yann E. MORIN
@ 2022-10-03  8:05   ` Erico Nunes
  0 siblings, 0 replies; 3+ messages in thread
From: Erico Nunes @ 2022-10-03  8:05 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: buildroot

On Sat, Oct 1, 2022 at 10:55 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Erico, All,
>
> On 2022-09-27 12:58 +0200, Erico Nunes spake thusly:
> > Drop patches which are already applied upstream.
> >
> > Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
>
> Does this change depend on the efivar bump, or can it be applied
> independently?

I'm not sure, but I guess having this with an older efivar is less
tested so it's probably best to apply it after the efivar bump. So
drop this for now and I'll resubmit as a series once v2 for efivar is
ready.

Erico
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-03  8:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27 10:58 [Buildroot] [PATCH] package/efibootmgr: bump to version 18 Erico Nunes
2022-10-01 20:54 ` Yann E. MORIN
2022-10-03  8:05   ` Erico Nunes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).