From 6db12316c217ee43346a145cb19415f374aa1809c73fac386bd5db662e07abcf Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 15 Dec 2020 06:27:21 +0000 Subject: [PATCH] Accepting request 855909 from home:gary_lin:branches:Base:System remove Block.HintSystem from ESP filtering (bsc#1179790) OBS-URL: https://build.opensuse.org/request/show/855909 OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=95 --- fwupd-bsc1179790-disable-hintsystem.patch | 21 +++++++++++++++++++++ fwupd.changes | 6 ++++++ fwupd.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 fwupd-bsc1179790-disable-hintsystem.patch diff --git a/fwupd-bsc1179790-disable-hintsystem.patch b/fwupd-bsc1179790-disable-hintsystem.patch new file mode 100644 index 0000000..1b8f498 --- /dev/null +++ b/fwupd-bsc1179790-disable-hintsystem.patch @@ -0,0 +1,21 @@ +commit c60e58b2cfa277950cce80c3a4d33a0faaa90f20 +Author: Richard Hughes +Date: Mon Dec 14 09:36:46 2020 +0000 + + Do not use the Block.HintSystem boolean for ESP filtering + + Fixes https://github.com/fwupd/fwupd/issues/2676 + +diff --git a/libfwupdplugin/fu-common.c b/libfwupdplugin/fu-common.c +index a3cc2d82..2e25095f 100644 +--- a/libfwupdplugin/fu-common.c ++++ b/libfwupdplugin/fu-common.c +@@ -2463,8 +2463,6 @@ fu_common_get_esp_default (GError **error) + g_autofree gchar *type = fu_volume_get_id_type (vol); + if (type == NULL) + continue; +- if (!fu_volume_is_internal (vol)) +- continue; + if (g_strcmp0 (type, "vfat") == 0) + g_ptr_array_add (volumes_vfat, vol); + } diff --git a/fwupd.changes b/fwupd.changes index 24edfde..583906f 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 14 09:58:47 UTC 2020 - Gary Ching-Pang Lin + +- Add fwupd-bsc1179790-disable-hintsystem.patch to remove + Block.HintSystem from ESP filtering (bsc#1179790) + ------------------------------------------------------------------- Wed Dec 09 07:53:07 UTC 2020 - glin@suse.com diff --git a/fwupd.spec b/fwupd.spec index 092d2dd..f7be35c 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -44,6 +44,8 @@ Source: %{name}-%{version}.tar.xz Patch1: fwupd-bsc1130056-change-shim-path.patch # PATCH-FIX-OPENSUSE fwupd-jscSLE-11766-close-efidir-leap-gap.patch jsc#SLE-11766 qkzhu@suse.com -- Set SLE and openSUSE esp os dir at runtime Patch2: fwupd-jscSLE-11766-close-efidir-leap-gap.patch +# PATCH-FIX-UPSTREAM fwupd-bsc1179790-disable-hintsystem.patch bsc#1179790 glin@suse.com Do not use the Block.HintSystem boolean for ESP filtering +Patch3: fwupd-bsc1179790-disable-hintsystem.patch BuildRequires: dejavu-fonts %if %{with fish_support}