diff --git a/.gitignore b/.gitignore index 3b28284..67dc35f 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ /DBXUpdate-20200729-aa64.cab /DBXUpdate-20200729-ia32.cab /DBXUpdate-20200729-x64.cab +/fwupd-1.7.1.tar.xz +/fwupd-efi-1.1.tar.xz diff --git a/0001-Do-not-use-the-LVFS.patch b/0001-Do-not-use-the-LVFS.patch deleted file mode 100644 index f6a828a..0000000 --- a/0001-Do-not-use-the-LVFS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 945ef070f2095eac32c9438a30f73acd3fda420c Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 24 Sep 2021 09:41:09 +0100 -Subject: [PATCH] Do not use the LVFS - ---- - data/remotes.d/lvfs.conf | 2 +- - libfwupd/fwupd-self-test.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/remotes.d/lvfs.conf b/data/remotes.d/lvfs.conf -index f956bc97..f993b970 100644 ---- a/data/remotes.d/lvfs.conf -+++ b/data/remotes.d/lvfs.conf -@@ -1,7 +1,7 @@ - [fwupd Remote] - - # this remote provides metadata and firmware marked as 'stable' from the LVFS --Enabled=true -+Enabled=false - Title=Linux Vendor Firmware Service - MetadataURI=https://cdn.fwupd.org/downloads/firmware.xml.gz - ReportURI=https://fwupd.org/lvfs/firmware/report -diff --git a/libfwupd/fwupd-self-test.c b/libfwupd/fwupd-self-test.c -index 089bfafe..606ceefc 100644 ---- a/libfwupd/fwupd-self-test.c -+++ b/libfwupd/fwupd-self-test.c -@@ -190,7 +190,7 @@ fwupd_remote_download_func (void) - g_assert_cmpint (fwupd_remote_get_kind (remote), ==, FWUPD_REMOTE_KIND_DOWNLOAD); - g_assert_cmpint (fwupd_remote_get_keyring_kind (remote), ==, FWUPD_KEYRING_KIND_JCAT); - g_assert_cmpint (fwupd_remote_get_priority (remote), ==, 0); -- g_assert (fwupd_remote_get_enabled (remote)); -+ //g_assert (fwupd_remote_get_enabled (remote)); - g_assert (fwupd_remote_get_metadata_uri (remote) != NULL); - g_assert (fwupd_remote_get_metadata_uri_sig (remote) != NULL); - g_assert_cmpstr (fwupd_remote_get_title (remote), ==, "Linux Vendor Firmware Service"); --- -2.32.0 - diff --git a/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch b/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch deleted file mode 100644 index a498076..0000000 --- a/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch +++ /dev/null @@ -1,109 +0,0 @@ -commit 4706031223f6809b40ef7d4c3f14103941621d57 -Author: Richard Hughes -Date: Fri Apr 9 15:20:13 2021 +0100 - - Write BMP data directly without using PIL - - This allows us to drop a build-time dep. - -diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py -index f1b00b8d..1d15bcf3 100755 ---- a/plugins/uefi-capsule/make-images.py -+++ b/plugins/uefi-capsule/make-images.py -@@ -16,6 +16,8 @@ import argparse - import tarfile - import math - import io -+import struct -+ - from typing import Dict, Optional, Any - - import cairo -@@ -24,7 +26,6 @@ import gi - gi.require_version("Pango", "1.0") - gi.require_version("PangoCairo", "1.0") - from gi.repository import Pango, PangoCairo --from PIL import Image - - - def languages(podir: str): -@@ -60,6 +61,33 @@ class PotFile: - continue - - -+def _cairo_surface_write_to_bmp(img: cairo.ImageSurface) -> bytes: -+ -+ data = bytes(img.get_data()) -+ return ( -+ b"BM" -+ + struct.pack( -+ " int: - - # open output archive -@@ -164,20 +192,14 @@ def main(args) -> int: - fs.foreach(do_write, None) - img.flush() - -- # write PNG -- with io.BytesIO() as io_png: -- img.write_to_png(io_png) -- io_png.seek(0) -- -- # convert to BMP and add to archive -- with io.BytesIO() as io_bmp: -- pimg = Image.open(io_png) -- pimg.save(io_bmp, format="BMP") -- filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height) -- tarinfo = tarfile.TarInfo(filename) -- tarinfo.size = io_bmp.tell() -- io_bmp.seek(0) -- tar.addfile(tarinfo, fileobj=io_bmp) -+ # convert to BMP and add to archive -+ with io.BytesIO() as io_bmp: -+ io_bmp.write(_cairo_surface_write_to_bmp(img)) -+ filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height) -+ tarinfo = tarfile.TarInfo(filename) -+ tarinfo.size = io_bmp.tell() -+ io_bmp.seek(0) -+ tar.addfile(tarinfo, fileobj=io_bmp) - - # success - return 0 -diff --git a/po/test-deps b/po/test-deps -index f5276daa..27b4055b 100755 ---- a/po/test-deps -+++ b/po/test-deps -@@ -34,12 +34,6 @@ except ValueError: - print("Error: missing cairo gobject introspection library") - err = 1 - --try: -- from PIL import Image --except ImportError: -- print("Error: missing dependency python pillow (python3-pil)") -- err = 1 -- - try: - import cairo - except ImportError: diff --git a/fwupd.spec b/fwupd.spec index 65760a1..eb6f302 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -5,6 +5,7 @@ %global libjcat_version 0.1.0 %global systemd_version 231 %global json_glib_version 1.1.1 +%global fwupdplugin_version 4 # although we ship a few tiny python files these are utilities that 99.99% # of users do not need -- use this to avoid dragging python onto CoreOS @@ -43,11 +44,12 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.5.9 -Release: 4%{?dist} +Version: 1.7.1 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz +Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab @@ -63,9 +65,6 @@ Source301: redhatsecureboot301.cer Source500: redhatsecurebootca5.cer Source503: redhatsecureboot503.cer -Patch0: 13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch -Patch2: 0001-Do-not-use-the-LVFS.patch - BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libxmlb-devel >= %{libxmlb_version} @@ -75,6 +74,7 @@ BuildRequires: libgusb-devel >= %{libgusb_version} BuildRequires: libcurl-devel >= %{libcurl_version} BuildRequires: libjcat-devel >= %{libjcat_version} BuildRequires: polkit-devel >= 0.103 +BuildRequires: protobuf-c-devel BuildRequires: sqlite-devel BuildRequires: systemd >= %{systemd_version} BuildRequires: systemd-devel @@ -90,7 +90,6 @@ BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils BuildRequires: meson -BuildRequires: help2man BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: vala BuildRequires: bash-completion @@ -102,6 +101,7 @@ BuildRequires: flashrom-devel >= 1.2-2 %if 0%{?have_modem_manager} BuildRequires: ModemManager-glib-devel >= 1.10.0 BuildRequires: libqmi-devel >= 1.22.0 +BuildRequires: libmbim-devel %endif %if 0%{?have_uefi} @@ -189,10 +189,14 @@ can be flashed using flashrom. It is probably not required on servers. %prep %autosetup -p1 +mkdir -p subprojects/fwupd-efi +tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 + %build %meson \ - -Dgtkdoc=true \ + -Ddocs=gtkdoc \ + -Dlvfs=disabled \ %if 0%{?enable_tests} -Dtests=true \ %else @@ -217,11 +221,14 @@ can be flashed using flashrom. It is probably not required on servers. %if 0%{?have_uefi} -Dplugin_uefi_capsule=true \ -Dplugin_uefi_pk=true \ - -Defi_sbat_distro_id="rhel" \ - -Defi_sbat_distro_summary="Red Hat Enterprise Linux" \ - -Defi_sbat_distro_pkgname="%{name}" \ - -Defi_sbat_distro_version="%{version}" \ - -Defi_sbat_distro_url="mail:secalert@redhat.com" \ +%ifarch x86_64 + -Dfwupd-efi:efi_sbat_distro_id="rhel" \ + -Dfwupd-efi:efi_sbat_distro_summary="Red Hat Enterprise Linux" \ + -Dfwupd-efi:efi_sbat_distro_pkgname="%{name}" \ + -Dfwupd-efi:efi_sbat_distro_version="%{version}" \ + -Dfwupd-efi:efi_sbat_distro_url="mail:secalert@redhat.com" \ + -Dfwupd-efi:efi-libdir="/usr/lib64" \ +%endif -Dplugin_tpm=true \ %else -Dplugin_uefi_capsule=false \ @@ -259,13 +266,8 @@ mkdir -p %{buildroot}/%{_datadir}/dbxtool install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{buildroot}/%{_datadir}/dbxtool # sign fwupd.efi loader -%if 0%{?have_uefi} %ifarch x86_64 %global efiarch x64 -%endif -%ifarch aarch64 -%global efiarch aa64 -%endif %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301 %pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503 @@ -300,7 +302,6 @@ done %doc README.md AUTHORS %license COPYING %config(noreplace)%{_sysconfdir}/fwupd/daemon.conf -%config(noreplace)%{_sysconfdir}/fwupd/upower.conf %if 0%{?have_uefi} %config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf %endif @@ -314,7 +315,9 @@ done %{_libexecdir}/fwupd/fwupdoffline %if 0%{?have_uefi} %{_libexecdir}/fwupd/efi/*.efi +%ifarch x86_64 %{_libexecdir}/fwupd/efi/*.efi.signed +%endif %{_bindir}/fwupdate %{_bindir}/fwupdtpmevlog %endif @@ -339,6 +342,7 @@ done %if 0%{?have_msr} /usr/lib/modules-load.d/fwupd-msr.conf %endif +/usr/lib/modules-load.d/fwupd-redfish.conf %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool @@ -387,96 +391,112 @@ done %dir %{_localstatedir}/cache/fwupd %dir %{_datadir}/fwupd/quirks.d %{_datadir}/fwupd/quirks.d/*.quirk -%{_localstatedir}/lib/fwupd/builder/README.md -%{_libdir}/libfwupd*.so.* +%{_datadir}/doc/fwupd/builder/README.md +%if 0%{?have_uefi} +%{_sysconfdir}/grub.d/35_fwupd +%endif +%{_libdir}/libfwupd.so.2* +%{_libdir}/libfwupdplugin.so.%{fwupdplugin_version}* %{_libdir}/girepository-1.0/Fwupd-2.0.typelib %{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib /usr/lib/udev/rules.d/*.rules /usr/lib/systemd/system-shutdown/fwupd.shutdown -%dir %{_libdir}/fwupd-plugins-3 -%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_dmar.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_facp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ata.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_bcm57xx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ccgx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_cros_ec.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_cpu.so +%dir %{_libdir}/fwupd-plugins-%{fwupdplugin_version} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_altos.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amt.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_analogix.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ata.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ccgx.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cfu.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_colorhug.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so %if 0%{?have_dell} -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_esrt.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_dock.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu_csr.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_elantp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_emmc.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ep963x.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_fastboot.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_fresco_pd.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_hailuck.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_iommu.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_jabra.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_lockdown.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_sleep.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_swap.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_tainted.so -%if 0%{?have_msr} -%{_libdir}/fwupd-plugins-3/libfu_plugin_msr.so -%endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_nitrokey.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_nvme.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_optionrom.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_bcr.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_mei.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pixart_rf.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_redfish.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hid.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hub.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_solokey.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_steelseries.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_superio.so -%if 0%{?have_dell} -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_mst.so -%endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_cxaudio.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_prometheus.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_rmi.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_system76_launch.so -%if 0%{?enable_dummy} -%{_libdir}/fwupd-plugins-3/libfu_plugin_test.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_invalid.so -%endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_thelio_io.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_dock.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ebitdo.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elantp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elanfp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_emmc.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ep963x.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fastboot.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_hailuck.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_iommu.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_jabra.so %if 0%{?have_uefi} -%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm_eventlog.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_bios.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_capsule.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_dbx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_pk.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_recovery.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_logind.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_logitech_hidpp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_vli.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_raw.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_usb.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_goodixmoc.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_swap.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so +%if 0%{?have_msr} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so +%endif +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nitrokey.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nvme.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_optionrom.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_bcr.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_mei.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_powerd.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_realtek_mst.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_redfish.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hub.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_solokey.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so +%if 0%{?have_dell} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so +%endif +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cape.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cxaudio.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_prometheus.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_rmi.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_system76_launch.so +%if 0%{?enable_dummy} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_test.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_invalid.so +%endif +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thelio_io.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so +%if 0%{?have_uefi} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm_eventlog.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bios.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_capsule.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_pk.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so +%endif +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logind.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_bulkcontroller.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_hidpp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_upower.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vli.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_raw.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_usb.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_goodixmoc.so %ghost %{_localstatedir}/lib/fwupd/gnupg %if 0%{?have_modem_manager} %files plugin-modem-manager -%{_libdir}/fwupd-plugins-3/libfu_plugin_modem_manager.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_modem_manager.so %endif %if 0%{?have_flashrom} %files plugin-flashrom -%{_libdir}/fwupd-plugins-3/libfu_plugin_flashrom.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_flashrom.so %endif %if 0%{?have_uefi} %{_datadir}/fwupd/uefi-capsule-ux.tar.xz @@ -491,20 +511,32 @@ done %{_libdir}/libfwupd*.so %{_libdir}/pkgconfig/fwupd.pc %{_libdir}/pkgconfig/fwupdplugin.pc +%if 0%{?have_uefi} +%{_libdir}/pkgconfig/fwupd-efi.pc +%endif %files tests %if 0%{?enable_tests} %dir %{_datadir}/installed-tests/fwupd +%{_datadir}/installed-tests/fwupd/tests/* %{_datadir}/installed-tests/fwupd/fwupd-tests.xml %{_datadir}/installed-tests/fwupd/*.test %{_datadir}/installed-tests/fwupd/*.cab %{_datadir}/installed-tests/fwupd/*.sh +%{_datadir}/fwupd/device-tests/*.json %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf %endif %changelog +* Mon Nov 01 2021 Richard Hughes 1.7.1-1 +- New upstream release +- Backport Fedora 34 changes +- Include support for Dell TBT4 Docking stations +- Resolves: rhbz#1974347 +- Resolves: rhbz#1991426 + * Fri Sep 24 2021 Richard Hughes 1.5.9-4 - Rebuilt to use redhatsecureboot503 signatures - Undo last Fedora sync to use the RHEL-specific patches diff --git a/sources b/sources index 678bffc..d48d4a9 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -SHA512 (fwupd-1.5.9.tar.xz) = 1d22bb9759bb0fa6a9030c83b3372ffd02f812c34e4d60f83cbacf5793d68dd846b353a3f127eccfb8f2cdcd329ba09320465cd2f0fe422dea13738e5b0b47ed +SHA512 (fwupd-1.7.1.tar.xz) = c5d2406065c73909d3cdf9815e31de386ef3f3cbeb7c2845eeee8655754bfe4b464d2660780a80835349394aeedb1891fcd0b1eee8db33a318095c81faf84297 +SHA512 (fwupd-efi-1.1.tar.xz) = 9070672f5238b3cbbd8d67dd72f822ccae58d73a380851ba7f69e4fbd415b96db2e79a73ddd12cb959ef5f158d55846ade7d45ea1d555ac2f4c923d5c3ab85f2 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a SHA512 (DBXUpdate-20160809-x64.cab) = c27c564999ae84515540f1a598cd0fd9ef3a80cdfaaf439f1c4cb04eaee0e73074548b6d76c21ca3af1ba9c4c0625907e821582998eb5617e33ecd412e6c8a13