mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
aac1660be3
@ -1,5 +1,5 @@
|
||||
[D-BUS Service]
|
||||
Name=org.bluez.obex
|
||||
Exec=/usr/lib/bluetooth/obexd
|
||||
Exec=/usr/lib/bluetooth/obexd -r /storage/downloads
|
||||
User=root
|
||||
|
||||
|
@ -71,6 +71,6 @@ pre_configure_target() {
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
mkdir -p $INSTALL/usr/share/dbus-1/services
|
||||
cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/services
|
||||
mkdir -p $INSTALL/usr/share/dbus-1/system-services
|
||||
cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/system-services
|
||||
}
|
||||
|
53
packages/network/bluez/patches/bluez-add-obexd-policy.patch
Normal file
53
packages/network/bluez/patches/bluez-add-obexd-policy.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From ef19c237a2578bd78cd75b4be636207c06e34c11 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Tue, 6 Aug 2013 12:35:27 +0300
|
||||
Subject: [PATCH] add obexd policy
|
||||
|
||||
---
|
||||
src/bluetooth.conf | 16 ++++++++++++++++
|
||||
1 files changed, 16 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/bluetooth.conf b/src/bluetooth.conf
|
||||
index 0495200..38020d7 100644
|
||||
--- a/src/bluetooth.conf
|
||||
+++ b/src/bluetooth.conf
|
||||
@@ -18,20 +18,36 @@
|
||||
<allow send_interface="org.bluez.Profile1"/>
|
||||
<allow send_interface="org.bluez.HeartRateWatcher1"/>
|
||||
<allow send_interface="org.bluez.CyclingSpeedWatcher1"/>
|
||||
+
|
||||
+ <allow own="org.bluez.obex"/>
|
||||
+ <allow send_destination="org.bluez.obex"/>
|
||||
+ <allow send_interface="org.bluez.obex.Agent1"/>
|
||||
+ <allow send_interface="org.bluez.obex.Client1"/>
|
||||
+ <allow send_interface="org.bluez.obex.Session1"/>
|
||||
+ <allow send_interface="org.bluez.obex.Transfer1"/>
|
||||
+ <allow send_interface="org.bluez.obex.ObjectPush1"/>
|
||||
+ <allow send_interface="org.bluez.obex.FileTransfer1"/>
|
||||
+ <allow send_interface="org.bluez.obex.PhonebookAccess1"/>
|
||||
+ <allow send_interface="org.bluez.obex.Synchronization1"/>
|
||||
+ <allow send_interface="org.bluez.obex.MessageAccess1"/>
|
||||
+ <allow send_interface="org.bluez.obex.Message1"/>
|
||||
</policy>
|
||||
|
||||
<policy at_console="true">
|
||||
<allow send_destination="org.bluez"/>
|
||||
+ <allow send_destination="org.bluez.obex"/>
|
||||
</policy>
|
||||
|
||||
<!-- allow users of lp group (printing subsystem) to
|
||||
communicate with bluetoothd -->
|
||||
<policy group="lp">
|
||||
<allow send_destination="org.bluez"/>
|
||||
+ <allow send_destination="org.bluez.obex"/>
|
||||
</policy>
|
||||
|
||||
<policy context="default">
|
||||
<deny send_destination="org.bluez"/>
|
||||
+ <deny send_destination="org.bluez.obex"/>
|
||||
</policy>
|
||||
|
||||
</busconfig>
|
||||
--
|
||||
1.7.2.5
|
||||
|
@ -0,0 +1,25 @@
|
||||
From 20dfa1079c088236bcd63f1a986956b488177ebf Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Tue, 6 Aug 2013 11:18:09 +0300
|
||||
Subject: [PATCH] obexd: use system bus
|
||||
|
||||
---
|
||||
obexd/src/manager.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
|
||||
index dbfbef8..9a29f8c 100644
|
||||
--- a/obexd/src/manager.c
|
||||
+++ b/obexd/src/manager.c
|
||||
@@ -569,7 +569,7 @@ gboolean manager_init(void)
|
||||
|
||||
dbus_error_init(&err);
|
||||
|
||||
- connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err);
|
||||
+ connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err);
|
||||
if (connection == NULL) {
|
||||
if (dbus_error_is_set(&err) == TRUE) {
|
||||
fprintf(stderr, "%s\n", err.message);
|
||||
--
|
||||
1.7.2.5
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 726e8ef3d6addd5ff2cf4525be574d6e5abd5a57
|
||||
Subproject commit ff051d8de5a8cc1cc378653df36e0a17ac95a9c1
|
Loading…
x
Reference in New Issue
Block a user