diff options
Diffstat (limited to 'meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5')
4 files changed, 37 insertions, 27 deletions
diff --git a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch deleted file mode 100644 index 44bae715..00000000 --- a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0d85faf308285c6a1f77f01660a2ce0541bfa5b4 Mon Sep 17 00:00:00 2001 -From: Matt Ranostay <matt.ranostay@konsulko.com> -Date: Wed, 12 Jun 2019 17:04:00 -0700 -Subject: [PATCH] obex: report notification status on incoming message - -To match doc/obex.txt on incoming message notification the respective -Status field should be set. ---- - obexd/client/map.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/obexd/client/map.c b/obexd/client/map.c -index 550c5afb4..23be2d6b2 100644 ---- a/obexd/client/map.c -+++ b/obexd/client/map.c -@@ -1914,6 +1914,7 @@ static void map_handle_notification(struct map_event *event, void *user_data) - switch (event->type) { - case MAP_ET_NEW_MESSAGE: - map_handle_new_message(map, event); -+ map_handle_status_changed(map, event, "notification"); - break; - case MAP_ET_DELIVERY_SUCCESS: - map_handle_status_changed(map, event, "delivery-success"); --- -2.20.1 - diff --git a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/bluetooth.service b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/bluetooth.service new file mode 100644 index 00000000..8ae83bd4 --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/bluetooth.service @@ -0,0 +1,21 @@ +[Unit] +Description=Bluetooth service +Documentation=man:bluetoothd(8) +ConditionPathIsDirectory=/sys/class/bluetooth + +[Service] +Type=dbus +BusName=org.bluez +ExecStartPre=-/usr/bin/hciconfig hci0 aclmtu 930:10 +ExecStart=/usr/libexec/bluetooth/bluetoothd +NotifyAccess=main +#WatchdogSec=10 +#Restart=on-failure +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE +LimitNPROC=1 +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=bluetooth.target +Alias=dbus-org.bluez.service diff --git a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/obex.service b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/obex.service new file mode 100644 index 00000000..87ffff6a --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/obex.service @@ -0,0 +1,10 @@ +[Unit] +Description=Bluetooth OBEX service + +[Service] +Type=dbus +BusName=org.bluez.obex +ExecStart=/usr/libexec/bluetooth/obexd --root=/var/volatile/tmp + +[Install] +Alias=dbus-org.bluez.obex.service diff --git a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend index 36fb3151..52ae30bc 100644 --- a/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-agl/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -2,7 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_append = " \ file://bluetooth.conf \ file://tmpdir.conf \ - file://0001-obex-report-notification-status-on-incoming-message.patch \ + file://obex.service \ + file://bluetooth.service \ " FILES_${PN} += "${systemd_user_unitdir}/obex.service.d/tmpdir.conf" @@ -12,8 +13,12 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then mkdir -p ${D}${systemd_user_unitdir}/obex.service.d + + install -m 0644 ${WORKDIR}/obex.service ${D}${systemd_user_unitdir} install -m 0644 ${WORKDIR}/tmpdir.conf ${D}${systemd_user_unitdir}/obex.service.d/tmpdir.conf mkdir -p ${D}/etc/systemd/user ln -sf ${systemd_user_unitdir}/obex.service ${D}/etc/systemd/user/dbus-org.bluez.obex.service + mkdir -p ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/bluetooth.service ${D}${systemd_system_unitdir} fi } |