Control: tags -1 + patch
On Fri, 23 Aug 2024 at 18:49:31 +0100, Simon McVittie wrote:
> fwupd-tests Depends on dbus-x11, which contains dbus-launch, a mechanism
> for running a D-Bus session bus in X11 sessions.
>
> I don't think fwupd-tests actually needs this
I've confirmed that debian/tests/ci passes with only the system bus and
not dbus-x11.
Please see attached patches, also available from
https://salsa.debian.org/efi-team/fwupd/-/merge_requests/15
smcv
>From cabb48fff445853f375211b6491d4f3128d8fc05 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Fri, 23 Aug 2024 16:48:13 +0100
Subject: [PATCH 1/2] d/control, d/control.in: tests depend on a system bus,
not dbus-x11
dbus-x11 provides a D-Bus session bus and the dbus-launch(1) executable,
but fwupd doesn't seem to use either of those: all it needs is the
D-Bus system bus (either the reference implementation dbus, or a
reimplementation like dbus-broker).
Closes: #1079481
---
debian/control | 2 +-
debian/control.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 8aab7e07f..92586d256 100644
--- a/debian/control
+++ b/debian/control
@@ -127,7 +127,7 @@ Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
ca-certificates,
- dbus-x11,
+ default-dbus-system-bus | dbus-system-bus,
fwupd,
gnome-desktop-testing,
polkitd | policykit-1,
diff --git a/debian/control.in b/debian/control.in
index f940ad0ad..92018694f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -69,7 +69,7 @@ Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
ca-certificates,
- dbus-x11,
+ default-dbus-system-bus | dbus-system-bus,
fwupd,
gnome-desktop-testing,
polkitd | policykit-1,
--
2.45.2
>From da49e796e12fd45182be853b27f23ef838c76861 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Fri, 23 Aug 2024 16:45:25 +0100
Subject: [PATCH 2/2] d/control, d/control.in: Recommend a non-specific D-Bus
system bus
dbus (the reference implementation of a D-Bus message bus) is currently
the default system bus for Debian, but I'm not aware of any reason why
dbus-broker wouldn't work equally well.
---
debian/control | 2 +-
debian/control.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 92586d256..9ff9922b0 100644
--- a/debian/control
+++ b/debian/control
@@ -95,7 +95,7 @@ Depends: ${misc:Depends},
systemd-sysusers
Recommends: python3,
bolt,
- dbus,
+ default-dbus-system-bus | dbus-system-bus,
secureboot-db,
udisks2,
fwupd-signed,
diff --git a/debian/control.in b/debian/control.in
index 92018694f..9261105fb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -37,7 +37,7 @@ Depends: ${misc:Depends},
systemd-sysusers
Recommends: python3,
bolt,
- dbus,
+ default-dbus-system-bus | dbus-system-bus,
secureboot-db,
udisks2,
fwupd-signed,
--
2.45.2
