10/11: gnu: efibootmgr: Update to 17.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 46cac065be7b457ea084633720eeb33c7d44222c
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Mar 23 14:12:29 2021 +0100

    gnu: efibootmgr: Update to 17.
    
    * gnu/packages/linux.scm (efibootmgr): Update to 17.
    [source]: Use GIT-FETCH and GIT-FILE-NAME.
    Add a patch to build against efivar@37.
    * gnu/packages/patches/efibootmgr-remove-extra-decl.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/linux.scm                             | 20 ++++++++--------
 .../patches/efibootmgr-remove-extra-decl.patch     | 27 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5c55550..f8991ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -955,6 +955,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/ecl-16-format-directive-limit.patch     \
   %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch  \
   %D%/packages/patches/ecl-16-libffi.patch                     \
+  %D%/packages/patches/efibootmgr-remove-extra-decl.patch      \
   %D%/packages/patches/eigen-remove-openmp-error-counting.patch        \
   %D%/packages/patches/eigen-stabilise-sparseqr-test.patch     \
   %D%/packages/patches/einstein-build.patch                    \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0eaf014..ac137f4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6163,15 +6163,17 @@ interface to the variable facility of UEFI boot 
firmware.")
 (define-public efibootmgr
   (package
     (name "efibootmgr")
-    (version "16")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/rhinstaller/efibootmgr";
-                                  "/releases/download/" version "/efibootmgr"
-                                  "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0pzn67vxxaf7jna4cd0i4kqm60h04kb21hckksv9z82q9gxra1wm"))))
+    (version "17")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rhinstaller/efibootmgr";)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"))
+       (patches (search-patches "efibootmgr-remove-extra-decl.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;no tests
diff --git a/gnu/packages/patches/efibootmgr-remove-extra-decl.patch 
b/gnu/packages/patches/efibootmgr-remove-extra-decl.patch
new file mode 100644
index 0000000..eb68108
--- /dev/null
+++ b/gnu/packages/patches/efibootmgr-remove-extra-decl.patch
@@ -0,0 +1,27 @@
+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>
+---
+ 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.24.0
+