From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C9A41382C5 for ; Fri, 18 Jun 2021 21:19:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5B26E086F; Fri, 18 Jun 2021 21:19:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A387AE086F for ; Fri, 18 Jun 2021 21:19:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73BF4335D74 for ; Fri, 18 Jun 2021 21:19:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AF1E7AC for ; Fri, 18 Jun 2021 21:19:35 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1624051170.36eb40e0d1be521917a2e4836ac4bbd89f9787a0.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd-efi/, sys-apps/fwupd-efi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild X-VCS-Directories: sys-apps/fwupd-efi/ sys-apps/fwupd-efi/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 36eb40e0d1be521917a2e4836ac4bbd89f9787a0 X-VCS-Branch: master Date: Fri, 18 Jun 2021 21:19:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2368b37b-9a06-408a-a9f9-f7bfd84717fd X-Archives-Hash: efde74a18f8a7bc90f257cd5346104ab commit: 36eb40e0d1be521917a2e4836ac4bbd89f9787a0 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jun 18 21:19:14 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jun 18 21:19:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36eb40e0 sys-apps/fwupd-efi: fix building Fixes PermissionError: [Errno 13] Permission denied: 'genpeimg' Closes: https://bugs.gentoo.org/796569 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> .../fwupd-efi-1.0-add-genpeimg-parameter.patch | 42 ++++++++++++++++++++++ .../files/fwupd-efi-1.0-pass-genpeimg.patch | 21 +++++++++++ sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild | 5 +++ 3 files changed, 68 insertions(+) diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch new file mode 100644 index 00000000000..a9791b4e114 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch @@ -0,0 +1,42 @@ +From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 14 May 2021 14:06:31 +0100 +Subject: [PATCH] generate_binary: add genpeimg option + +Add a --genpeimg option as the meson.build uses find_program(), so the +binary could be anywhere. +--- + efi/generate_binary.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/efi/generate_binary.py b/efi/generate_binary.py +index 0193e50..907af9f 100755 +--- a/efi/generate_binary.py ++++ b/efi/generate_binary.py +@@ -48,13 +48,15 @@ def _run_objcopy(args): + + + def _run_genpeimg(args): ++ if not args.genpeimg: ++ return + +- # this is okay if it does not exist +- argv = ["genpeimg", "-d", "+d", "+n", "-d", "+s", args.outfile] ++ argv = [args.genpeimg, "-d", "+d", "+n", "-d", "+s", args.outfile] + try: + subprocess.run(argv, check=True) + except FileNotFoundError as _: +- pass ++ print(str(e)) ++ sys.exit(1) + + + if __name__ == "__main__": +@@ -63,6 +65,7 @@ def _run_genpeimg(args): + parser.add_argument( + "--objcopy", default="objcopy", help="Binary file to use for objcopy" + ) ++ parser.add_argument("--genpeimg", help="Binary file to use for genpeimg") + parser.add_argument("--arch", default="x86_64", help="EFI architecture") + parser.add_argument("infile", help="Input file") + parser.add_argument("outfile", help="Output file") diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch new file mode 100644 index 00000000000..7e4dd1af329 --- /dev/null +++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch @@ -0,0 +1,21 @@ +From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 14 May 2021 14:07:11 +0100 +Subject: [PATCH] meson: pass the found genpeimg to generate_binary + +--- + efi/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/efi/meson.build b/efi/meson.build +index a496210..7cc1da1 100644 +--- a/efi/meson.build ++++ b/efi/meson.build +@@ -215,6 +215,7 @@ app = custom_target(efi_name, + '@INPUT@', '@OUTPUT@', + '--arch', gnu_efi_arch, + '--objcopy', efi_objcopy, ++ '--genpeimg', genpeimg.found() ? genpeimg : '' + ], + install : true, + install_dir : efi_app_location) diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild index fc3aa3397b2..1f99eec953e 100644 --- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild +++ b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild @@ -29,6 +29,11 @@ DEPEND="sys-boot/gnu-efi" RDEPEND="!