diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch deleted file mode 100644 index 3a4ecb1f29..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2c3896878ba8118b48c55528c6bac98f05f223f3 Mon Sep 17 00:00:00 2001 -From: Mikko Rapeli -Date: Thu, 3 Jul 2025 13:34:21 +0000 -Subject: [PATCH] build-certs.py: use /usr/bin/env for python3 - -Avoids errors if python3 install path is not -in /usr/bin. - -Signed-off-by: Mikko Rapeli ---- - data/tests/build-certs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/8998] - -diff --git a/data/tests/build-certs.py b/data/tests/build-certs.py -index 3b8503b72bcf..222e8a4a0f8b 100755 ---- a/data/tests/build-certs.py -+++ b/data/tests/build-certs.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # SPDX-License-Identifier: LGPL-2.1+ - - import os --- -2.43.0 - diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch deleted file mode 100644 index b0d3863eaa..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c96668ab830d016eeff977d5ca4f99d288cf38c0 Mon Sep 17 00:00:00 2001 -From: Mikko Rapeli -Date: Tue, 8 Jul 2025 07:05:02 +0000 -Subject: [PATCH] fu-lzma-common.c: reduce lzma compression level from 9 to - default 6 - -xz manual page says default is 6 and levels higher than that can cause -huge CPU and memory usage. On yocto qemu target, the fwupd tests -fail to run with compression level 9: - -FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) -not ok /fwupd/lzma - FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) - -With default compression level 6 the tests pass. - -https://linux.die.net/man/1/xz - - -6 ... -9 - Excellent compression with medium to high memory usage. - These are also slower than the lower preset levels. - The default is -6. Unless you want to maximize the compression ratio, - you probably don't want a higher preset level than -7 due to - speed and memory usage. - -Signed-off-by: Mikko Rapeli ---- - libfwupdplugin/fu-lzma-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/9019] - -diff --git a/libfwupdplugin/fu-lzma-common.c b/libfwupdplugin/fu-lzma-common.c -index a64ec773da91..d381ed52e135 100644 ---- a/libfwupdplugin/fu-lzma-common.c -+++ b/libfwupdplugin/fu-lzma-common.c -@@ -89,7 +89,7 @@ fu_lzma_compress_bytes(GBytes *blob, GError **error) - strm.next_in = g_bytes_get_data(blob, NULL); - strm.avail_in = g_bytes_get_size(blob); - -- rc = lzma_easy_encoder(&strm, 9, LZMA_CHECK_CRC64); -+ rc = lzma_easy_encoder(&strm, 6, LZMA_CHECK_CRC64); - if (rc != LZMA_OK) { - lzma_end(&strm); - g_set_error(error, --- -2.43.0 - diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb similarity index 93% rename from meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb rename to meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb index a40fa923f3..31b17486cb 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb @@ -17,11 +17,9 @@ DEPENDS = "\ SRC_URI = "\ https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://0001-build-certs.py-use-usr-bin-env-for-python3.patch \ - file://0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "83eab17ef2e65249491aef5e99419827b43ac56d40c5b0747b59ee94b147215e" +SRC_URI[sha256sum] = "79cce6b61d9ea531de0ef3b13e7f2682c699901b11f410b2ed91192618e1620e" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)"