bolt 0.9 release

Drop all patches, all included in the new upstream release.
This commit is contained in:
Christian Kellner 2020-06-15 20:53:17 +02:00
parent bbb3c9d33c
commit c76b7ce040
5 changed files with 8 additions and 82 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ tests/source/
/bolt-0.6.tar.gz
/bolt-0.7.tar.gz
/bolt-0.8.tar.gz
/bolt-0.9.tar.gz

View File

@ -1,27 +0,0 @@
From 5a739574608e5190816b3efd22e75f214c5fe4c4 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Thu, 23 Jan 2020 19:07:05 +0100
Subject: [PATCH] common: fix BoltError to be a typedef
It was always meant to be a typedef not a (tentative) definition
of a global variable.
---
common/bolt-error.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/bolt-error.h b/common/bolt-error.h
index 569da46..0486964 100644
--- a/common/bolt-error.h
+++ b/common/bolt-error.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
*
* Error codes used inside Bolt.
*/
-enum {
+typedef enum {
BOLT_ERROR_FAILED = 0,
BOLT_ERROR_UDEV,
BOLT_ERROR_NOKEY,
--
2.24.1

View File

@ -1,12 +1,10 @@
Name: bolt
Version: 0.8
Release: 4%{?dist}
Version: 0.9
Release: 1%{?dist}
Summary: Thunderbolt device manager
License: LGPLv2+
URL: https://gitlab.freedesktop.org/bolt/bolt
Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: wakeup-uevents.patch
Patch1: bolt-error-typedef.patch
BuildRequires: gcc
BuildRequires: asciidoc
@ -78,6 +76,10 @@ mentioned tasks.
%ghost %dir %{_localstatedir}/lib/boltd
%changelog
* Mon Jun 15 2020 Christian Kellner <ckellner@redhat.com> - 0.9-1
- bolt 0.9 release
Drop all patches (all merged upstream).
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (bolt-0.8.tar.gz) = 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
SHA512 (bolt-0.9.tar.gz) = 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78

View File

@ -1,50 +0,0 @@
From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Mon, 13 Jan 2020 17:38:47 +0100
Subject: [PATCH] manager: ignore wakeup device uevents for probing
The probing detection code should ignore wakeup device uevents
because these virtual devices can be added (and removed) without
and correspondence to any physical thunderbolt device (un-)plug
events.
---
boltd/bolt-manager.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c
index 877c008..c8b60da 100644
--- a/boltd/bolt-manager.c
+++ b/boltd/bolt-manager.c
@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev)
bolt_streq (driver, "thunderbolt");
}
+static gboolean
+device_is_wakeup (struct udev_device *dev)
+{
+ const char *subsys;
+
+ subsys = udev_device_get_subsystem (dev);
+
+ return bolt_streq (subsys, "wakeup");
+}
+
static gboolean
probing_add_root (BoltManager *mgr,
struct udev_device *dev)
@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr,
if (syspath == NULL)
return;
+ /* ignore events for wakeup devices which get removed
+ * and added at random time without any connection to
+ * any physical thunderbolt device */
+ if (device_is_wakeup (dev))
+ return;
+
roots = mgr->probing_roots;
for (guint i = 0; i < roots->len; i++)
{
--
2.24.1