From e79aa43a91d39bf1c2253d98e1bb7c289cc6a3ad Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 22 May 2020 11:58:43 +0100 Subject: [PATCH] Backport a patch to fix the synaptics fingerprint reader update --- ...heus-Force-the-minor-version-from-0x.patch | 32 +++++++++++++++++++ fwupd.spec | 7 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-synaptics-prometheus-Force-the-minor-version-from-0x.patch diff --git a/0001-synaptics-prometheus-Force-the-minor-version-from-0x.patch b/0001-synaptics-prometheus-Force-the-minor-version-from-0x.patch new file mode 100644 index 0000000..5760044 --- /dev/null +++ b/0001-synaptics-prometheus-Force-the-minor-version-from-0x.patch @@ -0,0 +1,32 @@ +From d7a1eb17bef650f13e7f96430f99294c36a40806 Mon Sep 17 00:00:00 2001 +From: Vincent Huang +Date: Tue, 19 May 2020 13:09:28 +0800 +Subject: [PATCH] synaptics-prometheus: Force the minor version from 0x02 to + 0x01 to make sure the devices can be updated back to 0x01. + +--- + plugins/synaptics-prometheus/fu-synaprom-device.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git plugins/synaptics-prometheus/fu-synaprom-device.c plugins/synaptics-prometheus/fu-synaprom-device.c +index 5a19203c..299ebde2 100644 +--- a/plugins/synaptics-prometheus/fu-synaprom-device.c ++++ b/plugins/synaptics-prometheus/fu-synaprom-device.c +@@ -142,6 +142,14 @@ fu_synaprom_device_set_version (FuSynapromDevice *self, + { + g_autofree gchar *str = NULL; + ++ /* We decide to skip 10.02.xxxxxx firmware, so we force the minor version from 0x02 ++ ** to 0x01 to make the devices with 0x02 minor version firmware allow to be updated ++ ** back to minor version 0x01. */ ++ if (vmajor == 0x0a && vminor == 0x02) { ++ g_debug ("quirking vminor from %02x to 01", vminor); ++ vminor = 0x01; ++ } ++ + /* set display version */ + str = g_strdup_printf ("%02u.%02u.%u", vmajor, vminor, buildnum); + fu_device_set_version (FU_DEVICE (self), str); +-- +2.26.2 + diff --git a/fwupd.spec b/fwupd.spec index ef5803e..0616fc3 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -41,11 +41,13 @@ Summary: Firmware update daemon Name: fwupd Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz +Patch1: 0001-synaptics-prometheus-Force-the-minor-version-from-0x.patch + BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libxmlb-devel >= %{libxmlb_version} @@ -403,6 +405,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/fwupd %endif %changelog +* Fri May 22 2020 Richard Hughes 1.4.2-2 +- Backport a patch to fix the synaptics fingerprint reader update. + * Mon May 18 2020 Richard Hughes 1.4.2-1 - New upstream release - Add several more ATA OUI quirks