Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump BlueZ to v5.79, sync package with upstream #79

Merged
merged 10 commits into from
Feb 26, 2025

Conversation

sairon
Copy link
Member

@sairon sairon commented Feb 26, 2025

No description provided.

ffontaine and others added 10 commits February 26, 2025 17:30
Fix the following build failure raised since bump to version 5.75 in
commit b890206 and
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f71892b63f6b65dab874a633d88ae2dcad93a16:

/home/autobuild/autobuild/instance-2/output-1/host/lib/gcc/x86_64-buildroot-linux-musl/12.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: plugins/bluetoothd-sixaxis.o: in function `sixaxis_init':
sixaxis.c:(.text.sixaxis_init+0x23): undefined reference to `udev_new'

Fixes: b890206
 - http://autobuild.buildroot.org/results/c337d0f473c5fbb3e6cda1317ba06f5e2b16a43e

Signed-off-by: Fabrice Fontaine <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 00773be)
Signed-off-by: Jan Čermák <[email protected]>
Disable installation of datafiles to avoid the following build failure
rasied since bump to version 5.75 in commit
b890206 and
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=be0e796299b0e7a73bf06c5655b56180588550b0:

rm: cannot remove '/home/buildroot/autobuild/instance-3/output-1/build/buildroot-fs/ext2/target/etc/bluetooth/input.conf': Permission denied
rm: cannot remove '/home/buildroot/autobuild/instance-3/output-1/build/buildroot-fs/ext2/target/etc/bluetooth/network.conf': Permission denied
rm: cannot remove '/home/buildroot/autobuild/instance-3/output-1/build/buildroot-fs/ext2/target/etc/bluetooth/main.conf': Permission denied

Fixes: b890206
 - http://autobuild.buildroot.org/results/cbd98588b3aced7c18467c2fec96e59c7d180881

Signed-off-by: Fabrice Fontaine <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 1a8676a)
Signed-off-by: Jan Čermák <[email protected]>
Removed patch which are included in this release, autoreconf is not
needed anymore.

Changelog:
https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog

Signed-off-by: Bernd Kuhls <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 35ee257177abc792d599636dd36792dfb3416a8d)
Signed-off-by: Jan Čermák <[email protected]>
asha profile as it depends on audio profile which isn't selected
by default (BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO), results in
below linking failure.

ld: profiles/audio/bluetoothd-asha.o: in function `get_transport':
asha.c:(.text.get_transport+0x2c): undefined reference to `media_transport_get_path'

Fixes: http://autobuild.buildroot.org/results/317bf4ad2593b1d1a8aec82cc0b3265285f00b7b/

Signed-off-by: Parthiban Nallathambi <[email protected]>
[[email protected]: add autobuild reference]
Signed-off-by: Yann E. MORIN <[email protected]>
(cherry picked from commit ce4e5fd129b557ac0411d0a0704be43717310d6d)
Signed-off-by: Jan Čermák <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 4856583d4f5384305bab9ba6837ff42e1e724fca)
Signed-off-by: Jan Čermák <[email protected]>
Symbols from the asha plugin are required when building a2dp
support as part of the audio plugins, so always enable asha
when audio plugins are selected.

Symbols from the bass plugin are required when building bap
support as part of the audio plugins, so always enable bass
when audio plugins are selected.

This issue appeared during an attempt to fix a related issue in
ce4e5fd129b557ac0411d0a0704be43717310d6d.

Fixes:
 - http://autobuild.buildroot.net/results/5a3/5a306356f5f190a14a0a2294a4428544b1a018bb
 - http://autobuild.buildroot.net/results/353/3539c83deaa45a3548bcd488659148c62af3fc73

Signed-off-by: James Hilliard <[email protected]>
Cc: Frank TEO <[email protected]>
Tested-by: Florian Fainelli <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit c4f22abb934c3ba3de92d468b36d719057755a4f)
Signed-off-by: Jan Čermák <[email protected]>
Upstream changelog:
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?h=5.79&id=0845b8f6ef2ac004b1c953cf4fe4ca3458cd8e36

Patch for musl compatibility taken from upstream "master".

Signed-off-by: Fiona Klute (WIWA) <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 6a4cdf2057335fc021b20488531e3293584840e7)
Signed-off-by: Jan Čermák <[email protected]>
Since D-Bus 1.14.0 installing default policies into sysconfdir (/etc)
is deprecated, they should go into datadir (/usr/share) instead
[1]. Follow that policy.

[1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/8f1e00427f7048f8b24c3a1cfca8903254fe00d4/NEWS#L274-283

Signed-off-by: Fiona Klute (WIWA) <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 99b473c94868163ac40311dc488a6d8491568429)
Signed-off-by: Jan Čermák <[email protected]>
The datafiles include the dbus policy, without which bluetoothd fails
to start (unless it is provided by other means):

# /usr/libexec/bluetooth/bluetoothd -n
bluetoothd[1011]: Bluetooth daemon 5.78
D-Bus setup failed: Connection ":1.7" is not allowed to own the service "org.bluez" due to security policies in the configuration file
bluetoothd[1011]: src/main.c:main() Unable to get on D-Bus

The installation issue 1a8676a was
meant to fix is the result of upstream incorrectly installing
/etc/bluetooth with 0555 (strictly read-only) permissions.

Fixes: 1a8676a

Signed-off-by: Fiona Klute (WIWA) <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 421a92a8973d23b017293ea8b776d34fb54a6b5e)
Signed-off-by: Jan Čermák <[email protected]>
* use long-form options
* consistently use start-stop-daemon with --exec
* wait for process to be gone and delete PID file on stop

Signed-off-by: Fiona Klute (WIWA) <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
(cherry picked from commit 8ea76e0986920f57f12b56c57872edf106064982)
Signed-off-by: Jan Čermák <[email protected]>
@sairon sairon merged commit 7d5c3b5 into 2024.02.x-haos Feb 26, 2025
@sairon sairon deleted the bump-bluez-5.79 branch February 26, 2025 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants