Browse Source
bluez: Update to 5.49
Update bluez to 5.49 Fix issue https://github.com/openwrt/packages/issues/1497 Fix issue https://github.com/openwrt/packages/issues/1503 Cherry pick patches from Alpine Linux repo Apply --gc-sections, saves about 500kbyte Drop audio.conf (not needed and deprecated) Remove bluetooth.dbus as upstream supplies a working copy Based on patch provided by Johnny Vogels https://github.com/openwrt/packages/pull/5937 Source: https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451 https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>lilik-openwrt-22.03
Daniel Engberg
7 years ago
7 changed files with 93 additions and 59 deletions
Split View
Diff Options
-
+11 -9utils/bluez/Makefile
-
+0 -1utils/bluez/files/audio.conf
-
+0 -37utils/bluez/files/bluetooth.dbus
-
+1 -0utils/bluez/files/bluetoothd.init
-
+10 -12utils/bluez/patches/201-readline.patch
-
+10 -0utils/bluez/patches/202-fix-endianness.patch
-
+61 -0utils/bluez/patches/203-obexd_without_systemd.patch
+ 11
- 9
utils/bluez/Makefile
View File
+ 0
- 1
utils/bluez/files/audio.conf
View File
| @ -1 +0,0 @@ | |||
| Enable=Source,Sink,Media,Socket | |||
+ 0
- 37
utils/bluez/files/bluetooth.dbus
View File
| @ -1,37 +0,0 @@ | |||
| <!-- This configuration file specifies the required security policies | |||
| for Bluetooth core daemon to work. --> | |||
| <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" | |||
| "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> | |||
| <busconfig> | |||
| <!-- ../system.conf have denied everything, so we just punch some holes --> | |||
| <policy user="root"> | |||
| <allow own="org.bluez"/> | |||
| </policy> | |||
| <policy at_console="true"> | |||
| <allow send_path="/"/> | |||
| <allow send_path="/org/bluez"/> | |||
| <allow send_destination="org.bluez.Manager"/> | |||
| <allow receive_sender="org.bluez.Manager"/> | |||
| <allow send_destination="org.bluez.Adapter"/> | |||
| <allow receive_sender="org.bluez.Adapter"/> | |||
| <allow send_destination="org.bluez.Device"/> | |||
| <allow receive_sender="org.bluez.Device"/> | |||
| <allow send_destination="org.bluez.Service"/> | |||
| <allow receive_sender="org.bluez.Service"/> | |||
| <allow send_destination="org.bluez.Database"/> | |||
| <allow receive_sender="org.bluez.Database"/> | |||
| <allow send_destination="org.bluez.Security"/> | |||
| <allow receive_sender="org.bluez.Security"/> | |||
| </policy> | |||
| </busconfig> | |||
+ 1
- 0
utils/bluez/files/bluetoothd.init
View File
+ 10
- 12
utils/bluez/patches/201-readline.patch
View File
+ 10
- 0
utils/bluez/patches/202-fix-endianness.patch
View File
| @ -0,0 +1,10 @@ | |||
| --- a/src/shared/util.h.old 2016-09-26 07:29:00.000000000 -0500 | |||
| +++ b/src/shared/util.h 2017-12-27 22:49:50.538716424 -0600 | |||
| @@ -26,6 +26,7 @@ | |||
| #include <alloca.h> | |||
| #include <byteswap.h> | |||
| #include <string.h> | |||
| +#include <endian.h> | |||
| #if __BYTE_ORDER == __LITTLE_ENDIAN | |||
| #define le16_to_cpu(val) (val) | |||
+ 61
- 0
utils/bluez/patches/203-obexd_without_systemd.patch
View File
| @ -0,0 +1,61 @@ | |||
| Submitted By: Armin K. <krejzi at email dot com> | |||
| Date: 2013-04-29 | |||
| Initial Package Version: 5.17 | |||
| Upstream Status: unknown | |||
| Origin: Arch Linux (Giovanni Campagna) | |||
| Description: Allow using obexd without systemd in the user session | |||
| Not all sessions run systemd --user (actually, the majority | |||
| doesn't), so the dbus daemon must be able to spawn obexd | |||
| directly, and to do so it needs the full path of the daemon. | |||
| --- | |||
| Makefile.obexd | 4 ++-- | |||
| obexd/src/org.bluez.obex.service | 4 ---- | |||
| obexd/src/org.bluez.obex.service.in | 4 ++++ | |||
| 3 files changed, 6 insertions(+), 6 deletions(-) | |||
| delete mode 100644 obexd/src/org.bluez.obex.service | |||
| create mode 100644 obexd/src/org.bluez.obex.service.in | |||
| diff --git a/Makefile.obexd b/Makefile.obexd | |||
| index 3760867..142e7c3 100644 | |||
| --- a/Makefile.obexd | |||
| +++ b/Makefile.obexd | |||
| @@ -2,12 +2,12 @@ | |||
| if SYSTEMD | |||
| systemduserunitdir = @SYSTEMD_USERUNITDIR@ | |||
| systemduserunit_DATA = obexd/src/obex.service | |||
| +endif | |||
| dbussessionbusdir = @DBUS_SESSIONBUSDIR@ | |||
| dbussessionbus_DATA = obexd/src/org.bluez.obex.service | |||
| -endif | |||
| -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service | |||
| +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in | |||
| obex_plugindir = $(libdir)/obex/plugins | |||
| diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service | |||
| deleted file mode 100644 | |||
| index a538088..0000000 | |||
| --- a/obexd/src/org.bluez.obex.service | |||
| +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| -[D-BUS Service] | |||
| -Name=org.bluez.obex | |||
| -Exec=/bin/false | |||
| -SystemdService=dbus-org.bluez.obex.service | |||
| diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in | |||
| new file mode 100644 | |||
| index 0000000..9c815f2 | |||
| --- /dev/null | |||
| +++ b/obexd/src/org.bluez.obex.service.in | |||
| @@ -0,0 +1,4 @@ | |||
| +[D-BUS Service] | |||
| +Name=org.bluez.obex | |||
| +Exec=@libexecdir@/obexd | |||
| +SystemdService=dbus-org.bluez.obex.service | |||
| -- | |||
| 1.8.3.1 | |||