diff --git a/1.2.14.tar.gz b/1.2.14.tar.gz deleted file mode 100644 index 14c973a86598262236c25d4cd554388df0392507..0000000000000000000000000000000000000000 Binary files a/1.2.14.tar.gz and /dev/null differ diff --git a/Set-polling-self-tests-to-slow.patch b/Set-polling-self-tests-to-slow.patch deleted file mode 100644 index 70dc372775cd729faf994f3e202f4701204c67e2..0000000000000000000000000000000000000000 --- a/Set-polling-self-tests-to-slow.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dd0b437d866878faa4672518b4b732e8ac00aa30 Mon Sep 17 00:00:00 2001 -From: Mario Limonciello -Date: Tue, 22 Oct 2019 09:29:41 -0500 -Subject: [PATCH] trivial: fu-self-test: set polling self tests to slow - -Currently the test runs for 100ms and looks to see that at least 8 times -the poll function callback hit. - -This normally works well enough, but during self tests it depends upon -too much timing and leads to failures sometimes: - -``` -** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.189: poll cnt=0 -*# DEBUG: poll cnt=1 -** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.199: poll cnt=1 -*** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.209: poll cnt=2 -** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.227: poll cnt=3 -*# DEBUG: poll cnt=4 -** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.255: poll cnt=4 -*# DEBUG: poll cnt=5 -** (/<>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.267: poll cnt=5 -Bail out! ERROR:../src/fu-self-test.c:3489:fu_device_poll_func: assertion failed (cnt >= 8): (6 >= 8) ---- stderr --- -** -ERROR:../src/fu-self-test.c:3489:fu_device_poll_func: assertion failed (cnt >= 8): (6 >= 8) -------- -``` - -Mark this as a slow test so that it doesn't cause CI failures. ---- - src/fu-self-test.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/fu-self-test.c b/src/fu-self-test.c -index 869b76fc5..2f4a83aa8 100644 ---- a/src/fu-self-test.c -+++ b/src/fu-self-test.c -@@ -4149,7 +4149,8 @@ main (int argc, char **argv) - g_test_add_func ("/fwupd/archive{cab}", fu_archive_cab_func); - g_test_add_func ("/fwupd/engine{requirements-other-device}", fu_engine_requirements_other_device_func); - g_test_add_func ("/fwupd/device{incorporate}", fu_device_incorporate_func); -- g_test_add_func ("/fwupd/device{poll}", fu_device_poll_func); -+ if (g_test_slow ()) -+ g_test_add_func ("/fwupd/device{poll}", fu_device_poll_func); - g_test_add_func ("/fwupd/device-locker{success}", fu_device_locker_func); - g_test_add_func ("/fwupd/device-locker{fail}", fu_device_locker_fail_func); - g_test_add_func ("/fwupd/device{metadata}", fu_device_metadata_func); diff --git a/fwupd-1.5.8.tar.xz b/fwupd-1.5.8.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ee925afaa003a6110fb8dc4e79bfa293dde3b9be Binary files /dev/null and b/fwupd-1.5.8.tar.xz differ diff --git a/fwupd.spec b/fwupd.spec index 9d09d26259472379f70859defddd4ee3c57502a9..56a3a719d0e55762a771859e38c65e62b5b4f41a 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -8,15 +8,12 @@ %endif Name: fwupd -Version: 1.2.14 +Version: 1.5.8 Release: 1 Summary: Make updating firmware on Linux automatic, safe and reliable License: LGPLv2+ URL: https://github.com/fwupd/fwupd/releases -Source0: https://github.com/fwupd/fwupd/archive/refs/tags/%{version}.tar.gz - -#Self-tests are failing due to an expired cert #1264 -Patch6000: Set-polling-self-tests-to-slow.patch +Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz BuildRequires: gettext glib2-devel libxmlb-devel valgrind valgrind-devel libgcab1-devel BuildRequires: gpgme-devel libgudev1-devel libgusb-devel libsoup-devel polkit-devel sqlite-devel libxslt @@ -64,9 +61,11 @@ This package contains the development and installed test files for %{name}. %build %meson -Dtests=true -Dgtkdoc=true -Dplugin_dummy=true \ %if %{with uefi} - -Dplugin_uefi=true -Dplugin_nvme=true \ + -Dplugin_uefi_capsule=true -Dplugin_uefi_pk=true \ + -Dplugin_nvme=true \ %else - -Dplugin_uefi=false -Dplugin_nvme=false \ + -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false \ + -Dplugin_nvme=false \ %endif %if %{with redfish} -Dplugin_redfish=true \ @@ -74,10 +73,11 @@ This package contains the development and installed test files for %{name}. -Dplugin_redfish=false \ %endif %if %{with libsmbios} - -Dplugin_dell=true -Dplugin_synaptics=true \ + -Dplugin_dell=true -Dplugin_synaptics_mst=true \ %else - -Dplugin_dell=false -Dplugin_synaptics=false \ + -Dplugin_dell=false -Dplugin_synaptics_mst=false \ %endif + -Dplugin_msr=false \ -Dman=true %meson_build @@ -120,53 +120,53 @@ mkdir -pm 0700 %{buildroot}%{_localstatedir}/lib/%{name}/gnupg %config(noreplace)%{_sysconfdir}/%{name}/remotes.d/*.conf %config(noreplace)%{_sysconfdir}/pki/%{name} %config(noreplace)%{_sysconfdir}/%{name}/daemon.conf +%config(noreplace)%{_sysconfdir}/%{name}/thunderbolt.conf +%config(noreplace)%{_sysconfdir}/%{name}/uefi_capsule.conf +%config(noreplace)%{_sysconfdir}/%{name}/upower.conf %{_sysconfdir}/pki/fwupd-metadata -%{_sysconfdir}/dbus-1/system.d/*.%{name}.conf +%{_datadir}/dbus-1/system.d/*.%{name}.conf %{_libexecdir}/%{name}/%{name} -%{_libexecdir}/%{name}/%{name}tool -%{_libexecdir}/%{name}/%{name}agent %{_libexecdir}/%{name}/%{name}offline %{_datadir}/bash-*/completions/* -%{_datadir}/%{name}/metainfo/*.metainfo.xml -%{_datadir}/%{name}/remotes.d/*/*/*.md %{_datadir}/metainfo/*.metainfo.xml -%{_datadir}/%{name}/firmware-packager %{_datadir}/dbus-1/interfaces/*.fwupd.xml %{_datadir}/dbus-1/system-services/*.service %{_datadir}/polkit-1/*/org.freedesktop* -%{_datadir}/%{name}/quirks.d/ +%{_datadir}/%{name}/ %{_datadir}/icons/hicolor/scalable/apps/*.%{name}.svg %{_localstatedir}/lib/%{name}/*/*.md %{_libdir}/lib%{name}*.so.* %{_libdir}/girepository-1.0/*.typelib -%{_prefix}/lib/udev/rules.d/*.rules -%{_prefix}/lib/systemd/system*/%{name}.shutdown %{_unitdir}/*.service %{_unitdir}/*.wants/ %{_libdir}/fwupd-plugins-3/*.so %ghost %{_localstatedir}/lib/fwupd/gnupg %if %{with uefi} -%config(noreplace)%{_sysconfdir}/%{name}/uefi.conf %{_libexecdir}/%{name}/efi/*.efi %{_libexecdir}/%{name}/efi/*.efi.signed -%{_libexecdir}/%{name}/fwupdate -%{_datadir}/*/*/LC_IMAGES/%{name}* %endif %if %{with redfish} %config(noreplace)%{_sysconfdir}/%{name}/redfish.conf %endif -%if %{with libsmbios} -%{_datadir}/%{name}/remotes.d/dell*/* +%{_presetdir}/fwupd-refresh.preset +/usr/lib/udev/rules.d/*.rules +/usr/lib/systemd/system-shutdown/fwupd.shutdown +%{_unitdir}/fwupd-refresh.timer +%ifarch x86_64 +%{_libexecdir}/fwupd/fwupd-detect-cet %endif +%{_datadir}/fish/vendor_completions.d/fwupdmgr.fish %files devel %{_libdir}/*.so %{_libdir}/*/*.pc %{_includedir}/* %{_datadir}/vala/* -%{_datadir}/gtk-doc/*/lib%{name} +%{_datadir}/gtk-doc/*/%{name} +%{_datadir}/doc/%{name} %{_datadir}/*/*.gir %{_datadir}/installed-tests/%{name} +%{_libexecdir}/installed-tests/%{name} %dir %{_sysconfdir}/%{name}/remotes.d %config(noreplace)%{_sysconfdir}/%{name}/remotes.d/%{name}-tests.conf @@ -174,6 +174,9 @@ mkdir -pm 0700 %{buildroot}%{_localstatedir}/lib/%{name}/gnupg %{_datadir}/man/man1/* %changelog +* Thu Jun 16 2022 lin zhang - 1.5.8-1 +- Upgrade to 1.5.8 + * Wed Jun 15 2022 xigaoxinyan - 1.2.14-1 - Update to 1.2.14