From patchwork Mon Apr 18 19:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5517 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KhyFL304Xz3xG6 for ; Mon, 18 Apr 2022 19:49:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KhyFJ4QKHzkl; Mon, 18 Apr 2022 19:49:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KhyFJ3Hsbz2yYt; Mon, 18 Apr 2022 19:49:40 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KhyFH0N18z2xCy for ; Mon, 18 Apr 2022 19:49:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KhyFF3X3xzdm for ; Mon, 18 Apr 2022 19:49:37 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1650311378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YuL8YIVegUgivihjCR1K7Gtl0pCBpfrWHVpKx5b1uCA=; b=+xRzX2dldWMDoDX9ZbJKLhTid4RNbjZAMG0JXLVFze2O1HtI41Z80bSwSC+3CblpaBPdnw YRr5x6VlYFPGiPCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1650311378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YuL8YIVegUgivihjCR1K7Gtl0pCBpfrWHVpKx5b1uCA=; b=KjsBmaiyBP+8U4v+kyjUbI+2Lt1XQP7YtEoUEqEue/B8/hnMl4H5Y2V+BNkzX/EDezIwGG 7q9FHOh4N/icWCwUlqSpDt6UslJ3kfyFVl0ey/4Y3+dqmDtXGdzIh5Gw7IHJDhxNFrIFZT +8JVA6W8gqQxJCSzdsJRa2xPYqu5qCXqp23SXq2M4YnXbcKrf1Ywcu/yAtawYGsrCm52Sn kOBgwbRoIqgznt71qxkJkg2iwMV0R0aN1zc3jw8rWFVbGPkMdDXBqYCE62PwmwgasAdkr4 2hsRsz+AMc++dmdz8h9TPRy6q0WSml05SRF2jGTorEiogp57Ch9IZY3S3ee//A== Message-ID: <7477fde3-73c2-9ed5-4151-54b957f1324c@ipfire.org> Date: Mon, 18 Apr 2022 19:49:32 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] efibootmgr: Update to 17 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Reviewed-by: Adolf Belka --- 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 # +# Copyright (C) 2007-2022 IPFire Team # # # # 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)