efibootmgr: Update to version 18

Message ID 20220824074904.2880-1-adolf.belka@ipfire.org
State Accepted
Commit 6ccf4650ec93a7107e69e8cbaae811ac9b71a317
Headers
Series efibootmgr: Update to version 18 |

Commit Message

Adolf Belka Aug. 24, 2022, 7:49 a.m. UTC
  - Update from version 17 to 18
- Update of rootfile not required
- Changelog
   bug fixes
    fixed the simple run example by @Katana-Steel in #88
    Restore activation error message in efibootmgr by @rbisewski in #89
    Android: correct the sources list by @cwhuang in #124
    remove-dupes: update error message by @raharper in #127
    Fix typo in manual page by @ferivoz in #136
    README: Note efivarfs as the current required kernel module by @cjmayo in #145
    Fix possible read out of bounds in ucs2_to_utf8 by @dlrobertson in #147
    Migrate CI by @frozencemetery in #153
    Add code of conduct by @frozencemetery in #154
    Fix help messages by @robert-scheck in #156
    Add option for insertion location of new entries by @frozencemetery in #166
   Full changelog can be found from the github repository comparing versio 17 to 18
    https://github.com/rhboot/efibootmgr/compare/17...18

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/efibootmgr | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
  

Comments

Peter Müller Sept. 12, 2022, 9:40 a.m. UTC | #1
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - Update from version 17 to 18
> - Update of rootfile not required
> - Changelog
>    bug fixes
>     fixed the simple run example by @Katana-Steel in #88
>     Restore activation error message in efibootmgr by @rbisewski in #89
>     Android: correct the sources list by @cwhuang in #124
>     remove-dupes: update error message by @raharper in #127
>     Fix typo in manual page by @ferivoz in #136
>     README: Note efivarfs as the current required kernel module by @cjmayo in #145
>     Fix possible read out of bounds in ucs2_to_utf8 by @dlrobertson in #147
>     Migrate CI by @frozencemetery in #153
>     Add code of conduct by @frozencemetery in #154
>     Fix help messages by @robert-scheck in #156
>     Add option for insertion location of new entries by @frozencemetery in #166
>    Full changelog can be found from the github repository comparing versio 17 to 18
>     https://github.com/rhboot/efibootmgr/compare/17...18
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  lfs/efibootmgr | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/lfs/efibootmgr b/lfs/efibootmgr
> index 2b399349c..9e11b6b0f 100644
> --- a/lfs/efibootmgr
> +++ b/lfs/efibootmgr
> @@ -24,10 +24,10 @@
>  
>  include Config
>  
> -VER        = 17
> +VER        = 18
>  
>  THISAPP    = efibootmgr-$(VER)
> -DL_FILE    = $(THISAPP).tar.gz
> +DL_FILE    = $(THISAPP).tar.bz2
>  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 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
> +$(DL_FILE)_BLAKE2 = dcea927a36f32e20da1a033c81ca21e83110bc2a82fdd17ec8d75a7fcfd7a946c155380ae634ab22ca8a8bae7f517967b09235d2587719e46b63c82e23d4a0f4
>  
>  install : $(TARGET)
>  
> @@ -72,9 +72,6 @@ $(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)
  

Patch

diff --git a/lfs/efibootmgr b/lfs/efibootmgr
index 2b399349c..9e11b6b0f 100644
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -24,10 +24,10 @@ 
 
 include Config
 
-VER        = 17
+VER        = 18
 
 THISAPP    = efibootmgr-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 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 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
+$(DL_FILE)_BLAKE2 = dcea927a36f32e20da1a033c81ca21e83110bc2a82fdd17ec8d75a7fcfd7a946c155380ae634ab22ca8a8bae7f517967b09235d2587719e46b63c82e23d4a0f4
 
 install : $(TARGET)
 
@@ -72,9 +72,6 @@  $(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)