| Message ID | 20250710085438.270911-2-mikko.rapeli@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/4] fwupd: update from 1.9.25 to 1.9.30 | expand |
On Thu, Jul 10, 2025 at 10:55 AM Mikko Rapeli via lists.openembedded.org <mikko.rapeli=linaro.org@lists.openembedded.org> wrote: > > Remove upstreamed patch. > > https://github.com/fwupd/fwupd-efi/releases/tag/1.7 > > This release fixes the following bugs: > > Fix compilation with GNU-EFI 4.0 > > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> > --- > ..._binary.py-Use-env-to-detect-python3.patch | 23 ------------------- > .../{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} | 5 ++-- > .../{fwupd_1.9.30.bb => fwupd_2.0.12.bb} | 0 > 3 files changed, 2 insertions(+), 26 deletions(-) > delete mode 100644 meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch > rename meta-oe/recipes-bsp/fwupd/{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} (90%) > rename meta-oe/recipes-bsp/fwupd/{fwupd_1.9.30.bb => fwupd_2.0.12.bb} (100%) Too late, but the rename of fwupd recipe didn't belong there. I've just noticed it now when looking at the fwupd upgrade and wondering how the PV was updated when the upgrade commit doesn't set it nor renames the file (because it was already renamed in this fwupd-efi commit instead). Cheers,
Hi, On Mon, Jul 14, 2025 at 04:52:40PM +0200, Martin Jansa wrote: > On Thu, Jul 10, 2025 at 10:55 AM Mikko Rapeli via > lists.openembedded.org > <mikko.rapeli=linaro.org@lists.openembedded.org> wrote: > > > > Remove upstreamed patch. > > > > https://github.com/fwupd/fwupd-efi/releases/tag/1.7 > > > > This release fixes the following bugs: > > > > Fix compilation with GNU-EFI 4.0 > > > > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> > > --- > > ..._binary.py-Use-env-to-detect-python3.patch | 23 ------------------- > > .../{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} | 5 ++-- > > .../{fwupd_1.9.30.bb => fwupd_2.0.12.bb} | 0 > > 3 files changed, 2 insertions(+), 26 deletions(-) > > delete mode 100644 meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch > > rename meta-oe/recipes-bsp/fwupd/{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} (90%) > > rename meta-oe/recipes-bsp/fwupd/{fwupd_1.9.30.bb => fwupd_2.0.12.bb} (100%) > > Too late, but the rename of fwupd recipe didn't belong there. I've > just noticed it now when looking at the fwupd upgrade and wondering > how the PV was updated when the upgrade commit doesn't set it nor > renames the file (because it was already renamed in this fwupd-efi > commit instead). Oops, indeed. Bad that this slipped through. Cheers, -Mikko
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch deleted file mode 100644 index c362681421b0..000000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4c8f95fedecbc590eb7cd98aaf97912fa36b8f2e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Jun 2024 23:58:36 -0700 -Subject: [PATCH] efi/generate_binary.py: Use env to detect python3 - -This enables python3 from native sysroot correctly - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - efi/generate_binary.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/efi/generate_binary.py b/efi/generate_binary.py -index 443472a..a4611bb 100755 ---- a/efi/generate_binary.py -+++ b/efi/generate_binary.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # - # Copyright (C) 2021 Javier Martinez Canillas <javierm@redhat.com> - # Copyright (C) 2021 Richard Hughes <richard@hughsie.com> diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb similarity index 90% rename from meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb rename to meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb index bbf2b1fdac06..d6ace116e789 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb @@ -2,10 +2,9 @@ SUMMARY = "EFI executable for fwupd" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ - file://0001-efi-generate_binary.py-Use-env-to-detect-python3.patch" +SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main" -SRCREV = "58a2928f778278ab1f7f8fcddbab81ba587a8962" +SRCREV = "cfd0be286a9b050c1aa4bfa3f0820256903a264a" DEPENDS = "gnu-efi python3-pefile-native" diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.30.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb similarity index 100% rename from meta-oe/recipes-bsp/fwupd/fwupd_1.9.30.bb rename to meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb
Remove upstreamed patch. https://github.com/fwupd/fwupd-efi/releases/tag/1.7 This release fixes the following bugs: Fix compilation with GNU-EFI 4.0 Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> --- ..._binary.py-Use-env-to-detect-python3.patch | 23 ------------------- .../{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} | 5 ++-- .../{fwupd_1.9.30.bb => fwupd_2.0.12.bb} | 0 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch rename meta-oe/recipes-bsp/fwupd/{fwupd-efi_1.6.bb => fwupd-efi_1.7.bb} (90%) rename meta-oe/recipes-bsp/fwupd/{fwupd_1.9.30.bb => fwupd_2.0.12.bb} (100%) v2: no changes