Accepting request 1265890 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1265890 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwupd?expand=0&rev=93
This commit is contained in:
Git OBS Bridge
125
8583.patch
125
8583.patch
@@ -1,125 +0,0 @@
|
||||
From a6338350485d78121fee4a69742b7de6275880cd Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Thu, 13 Mar 2025 16:38:52 +0100
|
||||
Subject: [PATCH] Fix build against pygobject 3.52
|
||||
|
||||
With the introduction of pygobject 3.52, accessing GIRepository 2.0 is
|
||||
no longer permitted.
|
||||
|
||||
Instead of complicating the test code with conditionalizing between
|
||||
GIRepository 2.0 and GIRepository 3.0 in override_gi_search_path,
|
||||
we can drop override_gi_search_path entirely and rely on GIRepository's
|
||||
own envvar GI_TYPELIB_PATH to help it find our freshly built typelib
|
||||
|
||||
Fixes #8569
|
||||
---
|
||||
contrib/test-venv.sh | 3 ++-
|
||||
data/tests/fwupd_test.py | 15 ---------------
|
||||
data/tests/meson.build | 7 ++++---
|
||||
plugins/meson.build | 7 ++++---
|
||||
plugins/pci-psp/pci_psp_test.py | 3 +--
|
||||
5 files changed, 11 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/contrib/test-venv.sh b/contrib/test-venv.sh
|
||||
index 1a061d3d7cf0..5e622b95b491 100755
|
||||
--- a/contrib/test-venv.sh
|
||||
+++ b/contrib/test-venv.sh
|
||||
@@ -5,7 +5,8 @@ BUILD=${VENV}/build
|
||||
INSTALLED_TESTS=${VENV}/dist/share/installed-tests/fwupd
|
||||
export G_TEST_BUILDDIR=${INSTALLED_TESTS}
|
||||
export G_TEST_SRCDIR=${INSTALLED_TESTS}
|
||||
-export LIBFWUPD_BUILD_DIR=${BUILD}/libfwupd
|
||||
+export GI_TYPELIB_PATH=${BUILD}/libfwupd
|
||||
+export LD_LIBRARY_PATH=${BUILD}/libfwupd
|
||||
export DAEMON_BUILDDIR=${BUILD}/src
|
||||
export PATH=${VENV}/bin:$PATH
|
||||
|
||||
diff --git a/data/tests/fwupd_test.py b/data/tests/fwupd_test.py
|
||||
index 4840fc52eeb5..e4b684fb428a 100755
|
||||
--- a/data/tests/fwupd_test.py
|
||||
+++ b/data/tests/fwupd_test.py
|
||||
@@ -22,19 +22,6 @@
|
||||
from gi.repository import UMockdev
|
||||
|
||||
|
||||
-def override_gi_search_path():
|
||||
- if "LIBFWUPD_BUILD_DIR" in os.environ:
|
||||
- gi.require_version("GIRepository", "2.0")
|
||||
- from gi.repository import GIRepository
|
||||
-
|
||||
- GIRepository.Repository.prepend_search_path(
|
||||
- os.path.join(os.environ["LIBFWUPD_BUILD_DIR"])
|
||||
- )
|
||||
- GIRepository.Repository.prepend_library_path(
|
||||
- os.path.join(os.environ["LIBFWUPD_BUILD_DIR"])
|
||||
- )
|
||||
-
|
||||
-
|
||||
class FwupdTest(dbusmock.DBusTestCase):
|
||||
DBUS_NAME = "org.freedesktop.fwupd"
|
||||
DBUS_PATH = "/"
|
||||
@@ -60,8 +47,6 @@ def setUpClass(cls):
|
||||
cls.start_system_bus()
|
||||
cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
|
||||
|
||||
- override_gi_search_path()
|
||||
-
|
||||
def setUp(self):
|
||||
self.testbed = UMockdev.Testbed.new()
|
||||
self.polkitd, self.obj_polkit = self.spawn_server_template(
|
||||
diff --git a/data/tests/meson.build b/data/tests/meson.build
|
||||
index 517ce034b3cc..74073f54194b 100644
|
||||
--- a/data/tests/meson.build
|
||||
+++ b/data/tests/meson.build
|
||||
@@ -140,10 +140,11 @@ if umockdev_integration_tests.allowed()
|
||||
foreach ut: unit_tests
|
||||
test(ut, python3, args: [fwupd_mockdev_tests, ut], is_parallel: false,
|
||||
env: {
|
||||
- 'DAEMON_BUILDDIR': join_paths(meson.project_build_root(), 'src'),
|
||||
- 'LIBFWUPD_BUILD_DIR': join_paths(meson.project_build_root(), 'libfwupd'),
|
||||
- 'STATE_DIRECTORY': join_paths(meson.project_build_root(), 'state'),
|
||||
'CACHE_DIRECTORY': join_paths(meson.project_build_root(), 'cache'),
|
||||
+ 'DAEMON_BUILDDIR': join_paths(meson.project_build_root(), 'src'),
|
||||
+ 'GI_TYPELIB_PATH': join_paths(meson.project_build_root(), 'libfwupd'),
|
||||
+ 'LD_LIBRARY_PATH': join_paths(meson.project_build_root(), 'libfwupd'),
|
||||
+ 'STATE_DIRECTORY': join_paths(meson.project_build_root(), 'state')
|
||||
},
|
||||
)
|
||||
endforeach
|
||||
diff --git a/plugins/meson.build b/plugins/meson.build
|
||||
index 22397c65b4f6..38bb648492e1 100644
|
||||
--- a/plugins/meson.build
|
||||
+++ b/plugins/meson.build
|
||||
@@ -153,12 +153,13 @@ endforeach
|
||||
|
||||
if umockdev_integration_tests.allowed()
|
||||
envs = environment()
|
||||
+ envs.set('CACHE_DIRECTORY', join_paths(meson.project_build_root(), 'cache'))
|
||||
envs.set('DAEMON_BUILDDIR', join_paths(meson.project_build_root(), 'src'))
|
||||
- envs.set('LIBFWUPD_BUILD_DIR', join_paths(meson.project_build_root(), 'libfwupd'))
|
||||
- envs.set('PYTHONPATH', join_paths(meson.project_source_root(), 'data', 'tests'))
|
||||
envs.set('FWUPD_DATADIR_QUIRKS', join_paths(meson.project_build_root()))
|
||||
+ envs.set('GI_TYPELIB_PATH', join_paths(meson.project_build_root(), 'libfwupd'))
|
||||
+ envs.set('LD_LIBRARY_PATH', join_paths(meson.project_build_root(), 'libfwupd'))
|
||||
+ envs.set('PYTHONPATH', join_paths(meson.project_source_root(), 'data', 'tests'))
|
||||
envs.set('STATE_DIRECTORY', join_paths(meson.project_build_root(), 'state'))
|
||||
- envs.set('CACHE_DIRECTORY', join_paths(meson.project_build_root(), 'cache'))
|
||||
|
||||
foreach suite: umockdev_tests
|
||||
r = run_command(unittest_inspector, suite,
|
||||
diff --git a/plugins/pci-psp/pci_psp_test.py b/plugins/pci-psp/pci_psp_test.py
|
||||
index b3f4f3d924c8..059bf272c1ce 100755
|
||||
--- a/plugins/pci-psp/pci_psp_test.py
|
||||
+++ b/plugins/pci-psp/pci_psp_test.py
|
||||
@@ -8,10 +8,9 @@
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
-from fwupd_test import FwupdTest, override_gi_search_path
|
||||
+from fwupd_test import FwupdTest
|
||||
|
||||
try:
|
||||
- override_gi_search_path()
|
||||
gi.require_version("Fwupd", "2.0")
|
||||
from gi.repository import Fwupd # pylint: disable=wrong-import-position
|
||||
except ValueError:
|
||||
33
8588.patch
33
8588.patch
@@ -1,33 +0,0 @@
|
||||
From 5e095c944557cbebc47cbf42c3738358fa4e45d4 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
Date: Fri, 14 Mar 2025 19:13:42 +0000
|
||||
Subject: [PATCH] trivial: Fix compile when using Pango >= 1.56.2
|
||||
|
||||
Fixes https://github.com/fwupd/fwupd/issues/8587
|
||||
---
|
||||
plugins/uefi-capsule/make-images.py | 12 ++++++++++--
|
||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py
|
||||
index d4c2242de5f0..a8641d61282a 100755
|
||||
--- a/plugins/uefi-capsule/make-images.py
|
||||
+++ b/plugins/uefi-capsule/make-images.py
|
||||
@@ -141,8 +141,16 @@ def main(args) -> int:
|
||||
items = Pango.itemize(pctx, label_translated, 0, length, attrs, None)
|
||||
if not items:
|
||||
continue
|
||||
- gs = Pango.GlyphString()
|
||||
- Pango.shape(label_translated, length, items[0].analysis, gs)
|
||||
+ try:
|
||||
+ # urgh, https://gitlab.gnome.org/GNOME/pango/-/merge_requests/829
|
||||
+ # -- if we depend on Pango >= 1.56.2 we can drop the fallback
|
||||
+ #
|
||||
+ # ...or if we depend on python3-gobject >= 3.51.0 we can use the nicer:
|
||||
+ # len(inspect.signature(Pango.shape).parameters)
|
||||
+ gs = Pango.shape(label_translated, length, items[0].analysis)
|
||||
+ except TypeError:
|
||||
+ gs = Pango.GlyphString()
|
||||
+ Pango.shape(label_translated, length, items[0].analysis, gs)
|
||||
del img, cctx, pctx, layout
|
||||
|
||||
def find_size(fs, f, data):
|
||||
2
_service
2
_service
@@ -4,7 +4,7 @@
|
||||
<param name="url">https://github.com/fwupd/fwupd.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="revision">2.0.6</param>
|
||||
<param name="revision">2.0.7</param>
|
||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
</service>
|
||||
|
||||
BIN
fwupd-2.0.6.obscpio
(Stored with Git LFS)
BIN
fwupd-2.0.6.obscpio
(Stored with Git LFS)
Binary file not shown.
3
fwupd-2.0.7.obscpio
Normal file
3
fwupd-2.0.7.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56d64ca46fda60878da658a2db150c34e4ce39126297fd3e5bb906c111fede7d
|
||||
size 20600333
|
||||
@@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 25 16:35:12 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 2.0.7:
|
||||
+ This release adds the following features:
|
||||
- Allow calling 'fwupdtool security' with a fwupd version parameter
|
||||
- A new plugin to update B&R DisplayPort receivers
|
||||
- A new plugin to update Intel CVS cameras
|
||||
- A new plugin to verify UEFI memory protection attributes
|
||||
- A new quirk to signify that no additional ESP space is required
|
||||
- Build additional Redfish instance IDs for Dell server hardware
|
||||
- Implement the HPE proprietary Redfish firmware push method
|
||||
- Support cabinet archives greater in size than 2GB
|
||||
- Support for showing the SBOM release URL
|
||||
- Support for UEFI capsule installation in the bootloader
|
||||
+ This release fixes the following bugs:
|
||||
- Always close USB file descriptors after starting the daemon
|
||||
- Do not add a Redfish release date if set to 00:00:00Z
|
||||
- Fix a critical warning when rescanning a device with no GUIDs
|
||||
- Fix a small memory leak when emumerating Logitech Rallysystem devices
|
||||
- Fix a tiny Redfish memory leak when writing firmware
|
||||
- Fix building against pygobject 3.52
|
||||
- Fix Logitech BulkController setup for new device firmware versions
|
||||
- Fix scaler-only Wacom USB update deployment
|
||||
- Fix updating the RMM component in the dell-kestrel dock
|
||||
- Fix writing new EFI variables to workaround a kernel regression
|
||||
- Make PCI NAME and SSVID_SSPID based modem-manager IDs visible
|
||||
- Parse firmware before putting the device into bootloader mode
|
||||
- Prepend the capsule header when using Capsule-on-Disk
|
||||
- Put a memory limit on decoding LZMA streams when parsing firmware
|
||||
- Retry claiming the fastboot interface for up to 2500ms
|
||||
- Trigger dpaux rescan on drm changes correctly
|
||||
- Use the metadata version format to set the version_lowest when required
|
||||
+ This release adds support for the following hardware:
|
||||
- Another HP wireless dongle
|
||||
- Lenovo ThinkPad Thunderbolt 4 Smart Dock Gen2
|
||||
- Lenovo USB-C Dual Display Travel Dock
|
||||
- More EDL 5G modem devices
|
||||
- Drop 8583.patch and 8588.patch: fixed upsrtream.
|
||||
- Align meson call with current upstream supported parameters.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 17 15:11:43 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: fwupd
|
||||
version: 2.0.6
|
||||
mtime: 1739538606
|
||||
commit: 476e1bf881daa548ad6bba60d713fe5666a9d53e
|
||||
version: 2.0.7
|
||||
mtime: 1742919338
|
||||
commit: 3259059db765f6dedb51021eba08e9ce813d5ae9
|
||||
|
||||
28
fwupd.spec
28
fwupd.spec
@@ -40,7 +40,7 @@
|
||||
%define docs 0
|
||||
|
||||
Name: fwupd
|
||||
Version: 2.0.6
|
||||
Version: 2.0.7
|
||||
Release: 0
|
||||
Summary: Device firmware updater daemon
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@@ -48,10 +48,6 @@ Group: System/Management
|
||||
URL: https://fwupd.org/
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8583.patch
|
||||
# PATCH-FIx-UPSTREAM
|
||||
Patch1: https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8588.patch
|
||||
# PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056
|
||||
Patch99: fwupd-bsc1130056-change-shim-path.patch
|
||||
|
||||
@@ -229,32 +225,10 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE"
|
||||
# Dell support requires direct SMBIOS access,
|
||||
# Synaptics requires Dell support, i.e. x86 only
|
||||
%meson \
|
||||
-Dlaunchd=disabled \
|
||||
-Dplugin_amdgpu=enabled \
|
||||
-Dpassim=disabled \
|
||||
%if %{with efi_fw_update}
|
||||
-Dplugin_uefi_capsule=enabled \
|
||||
-Dplugin_uefi_pk=enabled \
|
||||
-Defi_binary=false \
|
||||
%else
|
||||
-Dplugin_uefi_capsule=disabled \
|
||||
-Dplugin_uefi_pk=disabled \
|
||||
%endif
|
||||
%if %{with msr_support}
|
||||
-Dplugin_msr=enabled \
|
||||
%else
|
||||
-Dplugin_msr=disabled \
|
||||
%endif
|
||||
%if %{with dell_support}
|
||||
-Dplugin_synaptics_mst=enabled \
|
||||
%else
|
||||
-Dplugin_synaptics_mst=disabled \
|
||||
%endif
|
||||
%ifnarch %{ix86} x86_64
|
||||
-Dplugin_synaptics_rmi=disabled \
|
||||
%endif
|
||||
-Dplugin_nvme=enabled \
|
||||
-Dplugin_redfish=enabled \
|
||||
-Ddocs=enabled \
|
||||
-Dsupported_build=enabled \
|
||||
-Dtests=false \
|
||||
|
||||
Reference in New Issue
Block a user