Skip to content

package/bluez5_utils: bump to version 5.83 and fix LE connection abort#100

Merged
sairon merged 2 commits intohome-assistant:2025.02.x-haosfrom
bdraco:bluez-5.83-update
Aug 27, 2025
Merged

package/bluez5_utils: bump to version 5.83 and fix LE connection abort#100
sairon merged 2 commits intohome-assistant:2025.02.x-haosfrom
bdraco:bluez-5.83-update

Conversation

@bdraco
Copy link
Copy Markdown
Member

@bdraco bdraco commented Aug 22, 2025

  • Bump BlueZ from 5.79 to 5.83
  • Add patch to fix device removal on LE connection abort (from upstream PR #1521) This fixes an issue where temporary devices are incorrectly removed from D-Bus after connection failures, preventing retry attempts.

Fixes: bluez/bluez#1489

Copy link
Copy Markdown
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The existing patches don't apply anymore - the first two have been merged to 5.80, the rest to 5.83 - so they can be all deleted.

There are some (easily fixable) issues with the patch itself, as pointed out below.

Also, it would be better to split this into two commits - one doing the bump and removing the patches, the other adding the patch. Last nit is that the commits to Buildroot itself should have Signed-off-by line too - we don't enforce it but if you wanted to upstream the patches, it's mandatory there. Ideally just keep this PR opened and force-push the new two commits, so the PR can be FF-merged to our branch.

+ }

if (device_get_auto_connect(device)) {
DBG("Enabling automatic connections"); No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch has bad formatting, the missing newline prevents it from applying. With that fixed, it still applies with an offset on clean 5.83 sources:

Applying 0005-device-Fix-device-removal-on-le-connection-abort.patch using patch: 
patching file src/device.c
Hunk #1 succeeded at 6233 (offset -38 lines)

With this fix, the device remains available for the retry, allowing
the connection to succeed on subsequent attempts.

Fixes: https://github.com/bluez/bluez/issues/1489
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, but the patch also should have Upstream: annotation, pointing to the ML post: https://buildroot.org/downloads/manual/manual.html#_additional_patch_documentation

@home-assistant home-assistant Bot marked this pull request as draft August 25, 2025 11:40
@home-assistant
Copy link
Copy Markdown

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

sairon and others added 2 commits August 27, 2025 16:18
Removed patches merged upstream in 5.80 (first two) and 5.83.

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

Co-authored-by: J. Nick Koston <nick@koston.org>
Signed-off-by: Jan Čermák <sairon@sairon.cz>
…n-abort-by-local

Add yet unmerged patch for incorrect device removal after
le-connection-abort-by-local event, which can result in inability to retry
connection under some circumstances.

Fixes: bluez/bluez#1489
Co-authored-by: J. Nick Koston <nick@koston.org>
Signed-off-by: Jan Čermák <sairon@sairon.cz>
@sairon sairon force-pushed the bluez-5.83-update branch from 39a6c23 to 49cc269 Compare August 27, 2025 14:31
Copy link
Copy Markdown
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split into two commits and updated the patches. Adding @agners for another look.

@sairon sairon requested a review from agners August 27, 2025 14:33
@sairon sairon marked this pull request as ready for review August 27, 2025 14:44
@home-assistant home-assistant Bot requested a review from sairon August 27, 2025 14:44
Copy link
Copy Markdown
Member

@agners agners left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@sairon sairon merged commit 49cc269 into home-assistant:2025.02.x-haos Aug 27, 2025
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.

Services resolved is set to true before services are actually exported to Dbus after an le-connection-abort-by-local with PATCH

3 participants