aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-03-31 14:29:04 -0400
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-27 17:12:24 +0200
commit5fdeafddc96921d0019bbd291d068ad908f9be1c (patch)
tree3d42d5ca6aed499efea07ea7dfdb97f07d90c8df
parent76fdd8c9f0532c56d65e1124801bb1054c692078 (diff)
meta-agl-profile-core: update bluez5 for dunfell
Remove patch now present in bluez5 5.54 in dunfell. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ief1048638cad9f9d57738830ced91c0d828be79f
-rw-r--r--meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch26
-rw-r--r--meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend1
2 files changed, 0 insertions, 27 deletions
diff --git a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001-obex-report-notification-status-on-incoming-message.patch
deleted file mode 100644
index 44bae715e..000000000
--- a/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-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
index 55459c1ac..52ae30bc5 100644
--- a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -4,7 +4,6 @@ SRC_URI_append = " \
file://tmpdir.conf \
file://obex.service \
file://bluetooth.service \
- file://0001-obex-report-notification-status-on-incoming-message.patch \
"
FILES_${PN} += "${systemd_user_unitdir}/obex.service.d/tmpdir.conf"