MSVSphere Packaging Team
2 months ago
parent
0cb9223135
commit
1a67a86a7f
GPG Key ID:
B2B0B9F29E528FE8
@ -1 +1 @@
|
||||
SOURCES/upower-v1.90.4.tar.bz2
|
||||
SOURCES/upower-v1.90.6.tar.bz2
|
||||
|
||||
@ -1 +1 @@
|
||||
82b69c2c59c49d75f2e3c81a3d086d5d1ebda1f2 SOURCES/upower-v1.90.4.tar.bz2
|
||||
4d1a005e5dd6bb907e7dae79753e98891888de36 SOURCES/upower-v1.90.6.tar.bz2
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 9ee76826bd41a5d3a377dfd6f5835f42ec50be9a Mon Sep 17 00:00:00 2001
|
||||
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
|
||||
Date: Wed, 25 Sep 2024 16:56:11 +0100
|
||||
Subject: [PATCH] Fix race condition in test_sibling_priority_no_overwrite
|
||||
|
||||
---
|
||||
src/linux/integration-test.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
|
||||
index 6b1514a9..f6c804a4 100755
|
||||
--- a/src/linux/integration-test.py
|
||||
+++ b/src/linux/integration-test.py
|
||||
@@ -3148,8 +3148,8 @@ class Tests(dbusmock.DBusTestCase):
|
||||
def test_sibling_priority_no_overwrite(self):
|
||||
'Test siblings using the fallback device do not overwrite previous guesses'
|
||||
|
||||
- self.start_daemon()
|
||||
self.testbed.add_from_file(os.path.join(edir, 'tests/wacom-pen-digitiser.device'))
|
||||
+ self.start_daemon()
|
||||
|
||||
self.assertDevs({
|
||||
'battery_wacom_battery_0': {
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From 7d7bb84fde91bef9ee7eba924cbdfa74639cc4fe Mon Sep 17 00:00:00 2001
|
||||
From: Kate Hsuan <hpa@redhat.com>
|
||||
Date: Tue, 18 Jun 2024 15:04:29 +0800
|
||||
Subject: [PATCH] linux: up-enumerator-udev: Find the correct parent id for
|
||||
input devices
|
||||
|
||||
The parent id for the devices under "/sys/devices/virtual/misc/uhid/*"
|
||||
points to /sys/devices/virtual/misc/uhid. It will cause the device
|
||||
information to be updated incorrectly. For example, the type for a mouse is
|
||||
updated to "keyboard". This patch makes sure the correct parent id for
|
||||
each input device.
|
||||
|
||||
Resolves: #268 #286
|
||||
---
|
||||
src/linux/up-enumerator-udev.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/linux/up-enumerator-udev.c b/src/linux/up-enumerator-udev.c
|
||||
index 36e3887b..553f6524 100644
|
||||
--- a/src/linux/up-enumerator-udev.c
|
||||
+++ b/src/linux/up-enumerator-udev.c
|
||||
@@ -66,8 +66,17 @@ device_parent_id (GUdevDevice *dev)
|
||||
return NULL;
|
||||
|
||||
/* Continue walk if the parent is a "hid" device */
|
||||
- if (g_strcmp0 (subsystem, "hid") == 0)
|
||||
+ if (g_strcmp0 (subsystem, "hid") == 0) {
|
||||
+ /* if the parent is under /sys/devices/virtual/misc/uhid, the device should be input devices
|
||||
+ * and return the path immediately to make sure they belongs to the correct parent.
|
||||
+ * for example:
|
||||
+ * root@fedora:/sys/devices/virtual/misc/uhid# ls
|
||||
+ * 0005:046D:B01A.0005 0005:05AC:0250.000B dev power subsystem uevent */
|
||||
+ if (g_strrstr (g_udev_device_get_sysfs_path (parent), "/sys/devices/virtual/misc/uhid"))
|
||||
+ return g_strdup (g_udev_device_get_sysfs_path (parent));
|
||||
+
|
||||
return device_parent_id (parent);
|
||||
+ }
|
||||
|
||||
/* Also skip over USB interfaces, we care about full devices */
|
||||
if (g_strcmp0 (subsystem, "usb") == 0 &&
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Reference in new issue