4 files changed, 2 insertions, 72 deletions
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 254a6444495b..bd0b74505350 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,5 +1,3 @@
-AUX fwupd-efi-1.0-add-genpeimg-parameter.patch 1443 BLAKE2B 75b4230924fa6338ce089344dfd1a389452c195939cf04eacb5e0e92eaa5995ead1510f3b4f341385c1cab47f2b469d32ac017bc3c888c94b9f5c4956799f8e8 SHA512 3e08031a23afd58c3f20daa54b0506b82146e0dcc4c8568b7914f2db732bdf36f22a6d951adf76ea16a54c2130a0d9d5770381d21035c047eca0672ebfb7c892
-AUX fwupd-efi-1.0-pass-genpeimg.patch 774 BLAKE2B 86b3e04192c62a87d384dfd550f13937ab6ec72ddb89d2b8b341a3934aecbd06f4d0e500d2496006c60361d96e63cf5adba115b492865c31ebe1924e9ba6b85b SHA512 2f51f988cb488a0d1e0a4812c2bb06e1c15ebe5b57e4378c2d0869ca1a975e28819feb415c917779ef8b27aba6c9f3701beb94b38eb8e34f8ed7318823c5a02c
-DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4
-EBUILD fwupd-efi-1.0.ebuild 1171 BLAKE2B aebf9f17f7b556cc11ada1cf0e065ce373dbc54199fdd8bf996f9f105aebdd9e62fa44249767e1344e19eaff01d99554b1ca9a5be7f41bfba6503f82fa32d585 SHA512 c8202bd14c8655dc925e1b9698c049f4b682642c3279c1a7b906be2622ba1f13ae4afa76b6f5648bdcebd3af812c4d5bb6972c81fe9c790fa7258c980823c764
+DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
+EBUILD fwupd-efi-1.1.ebuild 1069 BLAKE2B d243fc64a0a1110e777842b6343b1cb3dc893883a0220a3e4b39b37b6ae41e7286b3d900ae1d797f75bf369d90cb97a823e92b6b188a9f598e07b774451d4416 SHA512 c8b2270bd1abb5f9240f15c4524ad8c1c80ee98ba2bdf6a225755c375baf2ed0014a231698292127f0cfcb186f63190a7d9334946882df9d42d78b134c92030c
 MISC metadata.xml 506 BLAKE2B 13136a7a9c7c6dd0da4a85eaee0fa9b2545eae59b2dc8576ac679af1ec3818a973eceb08e7c3c5fb4c4ac965bd1519ea443080a5f7bd84ec04ae3d914a75d0a8 SHA512 dbc1db78b748d1ef5b6679c696da79e4834b00844a4c39102504cdede6cb72e7de3eb7975cee65e9f86f232dd20ec0ce998586c6ace9423481056071dc08c1f3
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
deleted file mode 100644
index a9791b4e1144..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-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
deleted file mode 100644
index 7e4dd1af3294..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-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.1.ebuild
index 1f99eec953ed..fc3aa3397b23 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
@@ -29,11 +29,6 @@ DEPEND="sys-boot/gnu-efi"
 
 RDEPEND="!<sys-apps/fwupd-1.6.0"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-add-genpeimg-parameter.patch
-	"${FILESDIR}"/${P}-pass-genpeimg.patch
-)
-
 src_prepare() {
 	default