[PATCH] efibootmgr: Update to 17

[PATCH] efibootmgr: Update to 17

[Peter Müller]

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

Full changelog as per https://github.com/rhboot/efibootmgr/releases/tag/17:

    various CI updates
    Make.defaults: fix pkg-config invocation for LDFLAGS
    make_linux_load_option(): add some more efi_error() calls
    Change the default partition choice.
    Don't set LIBEFIBOOT_REPORT_GPT_ERRORS=1
    Make it easier to build with a devel branch of efivar
    efibootmgr -e: improve parsing for efivar-36 compat
    Fix an invalid free()
    Propogate verbosity to libefivar 36's internal logging facility
    Add a bit more logging

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 lfs/efibootmgr | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lfs/efibootmgr b/lfs/efibootmgr
index 9eb9a5304..2b399349c 100644
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 16
+VER        = 17
 
 THISAPP    = efibootmgr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232
+$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
 
 install : $(TARGET)
 
@@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+	# Compile fix
+	cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
+
 	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		EFIDIR=$(SNAME) $(MAKETUNING)
 	cd $(DIR_APP) && make install EFIDIR=$(SNAME)
-- 
2.34.1

Re: [PATCH] efibootmgr: Update to 17

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 18/04/2022 21:49, Peter Müller wrote:
> Full changelog as per https://github.com/rhboot/efibootmgr/releases/tag/17:
>
>      various CI updates
>      Make.defaults: fix pkg-config invocation for LDFLAGS
>      make_linux_load_option(): add some more efi_error() calls
>      Change the default partition choice.
>      Don't set LIBEFIBOOT_REPORT_GPT_ERRORS=1
>      Make it easier to build with a devel branch of efivar
>      efibootmgr -e: improve parsing for efivar-36 compat
>      Fix an invalid free()
>      Propogate verbosity to libefivar 36's internal logging facility
>      Add a bit more logging
>
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
>   lfs/efibootmgr | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/lfs/efibootmgr b/lfs/efibootmgr
> index 9eb9a5304..2b399349c 100644
> --- a/lfs/efibootmgr
> +++ b/lfs/efibootmgr
> @@ -1,7 +1,7 @@
>   ###############################################################################
>   #                                                                             #
>   # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
> +# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
>   #                                                                             #
>   # This program is free software: you can redistribute it and/or modify        #
>   # it under the terms of the GNU General Public License as published by        #
> @@ -24,10 +24,10 @@
>   
>   include Config
>   
> -VER        = 16
> +VER        = 17
>   
>   THISAPP    = efibootmgr-$(VER)
> -DL_FILE    = $(THISAPP).tar.bz2
> +DL_FILE    = $(THISAPP).tar.gz
>   DL_FROM    = $(URL_IPFIRE)
>   DIR_APP    = $(DIR_SRC)/$(THISAPP)
>   TARGET     = $(DIR_INFO)/$(THISAPP)
> @@ -41,7 +41,7 @@ objects = $(DL_FILE)
>   
>   $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>   
> -$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232
> +$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
>   
>   install : $(TARGET)
>   
> @@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>   	@$(PREBUILD)
>   	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
>   
> +	# Compile fix
> +	cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
> +
>   	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
>   		EFIDIR=$(SNAME) $(MAKETUNING)
>   	cd $(DIR_APP) && make install EFIDIR=$(SNAME)