Re: [PR PATCH] [Updated] efibootmgr: update to 18.

[motorto <motorto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages efibootmgr-18
https://github.com/void-linux/void-packages/pull/38346

efibootmgr: update to 18.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l



A patch file from https://github.com/void-linux/void-packages/pull/38346.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-18-38346.patch --]
[-- Type: text/x-diff, Size: 5123 bytes --]

From 6d114f67720998b952f47b9a8c44d421870622de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 28 Jul 2022 21:46:54 +0100
Subject: [PATCH] efibootmgr: update to 18.

---
 .../patches/efibootmgr_default_to_grub2.patch | 34 +++++++++++++------
 .../patches/efivar-efi_set_verbose.patch      | 12 -------
 srcpkgs/efibootmgr/template                   | 15 ++++----
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch

diff --git a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
index d4d6c8784807..d7090f5080c8 100644
--- a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
+++ b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
@@ -1,20 +1,34 @@
+From 2af29c3dfba668f341b007261954a829ec148f82 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Thu, 28 Jul 2022 21:42:22 +0100
+Subject: [PATCH 1/1] efibootmgr_default_to_grub2
+
+---
+ src/efibootmgr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index b980bcd..c9ff07b 100644
 --- a/src/efibootmgr.c
 +++ b/src/efibootmgr.c
-@@ -1239,7 +1239,7 @@ usage()
- 	printf("\t     --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
- #endif
- 	printf("\t-l | --loader name     (defaults to \""DEFAULT_LOADER"\")\n");
--	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\")\n");
+@@ -1412,7 +1412,7 @@ usage()
+ 	printf("\t-i | --iface name     Create a netboot entry for the named interface.\n");
+ 	printf("\t-I | --index number   When creating an entry, insert it in bootorder at specified position (default: 0).\n");
+ 	printf("\t-l | --loader name     (Defaults to \""DEFAULT_LOADER"\").\n");
+-	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\").\n");
 +	printf("\t-L | --label label     Boot manager display label (defaults to \"Void Linux (GRUB2)\")\n");
- 	printf("\t-m | --mirror-below-4G t|f mirror memory below 4GB\n");
- 	printf("\t-M | --mirror-above-4G X percentage memory to mirror above 4GB\n");
- 	printf("\t-n | --bootnext XXXX   set BootNext to XXXX (hex)\n");
-@@ -1269,7 +1269,7 @@ set_default_opts()
+ 	printf("\t-m | --mirror-below-4G t|f Mirror memory below 4GB.\n");
+ 	printf("\t-M | --mirror-above-4G X Percentage memory to mirror above 4GB.\n");
+ 	printf("\t-n | --bootnext XXXX   Set BootNext to XXXX (hex).\n");
+@@ -1444,7 +1444,7 @@ set_default_opts()
  	opts.timeout         = -1;   /* Don't set it */
  	opts.edd10_devicenum = 0x80;
  	opts.loader          = DEFAULT_LOADER;
 -	opts.label           = (unsigned char *)"Linux";
 +	opts.label           = (unsigned char *)"Void Linux (GRUB2)";
  	opts.disk            = "/dev/sda";
- 	opts.part            = 1;
+ 	opts.part            = -1;
  }
+-- 
+2.37.1
+
diff --git a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch b/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
deleted file mode 100644
index 8b5eebdf8b6b..000000000000
--- a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/efibootmgr.c	2019-01-16 16:38:24.694719888 +0100
-+++ b/src/efibootmgr.c	2019-01-16 16:39:35.773715651 +0100
-@@ -1536,9 +1536,6 @@
- 					       "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/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index bd2e88bbbeac..2f636914a566 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,16 +1,15 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
-version=17
-revision=6
+version=18
+revision=1
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rhinstaller/efibootmgr"
-distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
+homepage="https://github.com/rhboot/efibootmgr"
 distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz"
-checksum=22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d
+checksum=442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874
 
 conf_files="/etc/default/efibootmgr-kernel-hook"
 
@@ -27,6 +26,10 @@ case "$XBPS_TARGET_MACHINE" in
 		broken="unsupported UEFI for architecture ${XBPS_TARGET_MACHINE}" ;;
 esac
 
+do_configure() {
+	sed -i 's/-Werror //' Make.defaults
+}
+
 do_build() {
 	make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}"
 }