Skip to content

Commit

Permalink
bluez5: update the patches to apply on 5.56 version from oe-core
Browse files Browse the repository at this point in the history
:Release Notes:
Resolve conflicts mostly from these 2 upstream changes:
commit c4ef8f8d048a30304ba4cb1b83bfe39b55c13ba7
Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date:   Wed Oct 28 14:53:36 2020 -0700

    core: Rename hcid.h to btd.h

    Since we use btd term for daemon APIs it makes sense to use it also
    for the header name instead of hcid.

commit 01d035d33886b13cd6dc361f994ce22ad47daf61
Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date:   Wed Oct 28 14:50:00 2020 -0700

    core: Rename main_opts to btd_opts

    Use btd_ prefix since this is a daemon API.

:Detailed Notes:
Fixes:
NOTE: --- Patch fuzz start ---
Applying patch 0011-Fix-volume-level-notification-not-appearing-after-12.patch
patching file profiles/audio/media.c
Hunk #1 succeeded at 1235 (offset 1 line).
patching file profiles/audio/transport.c
Hunk #1 succeeded at 656 (offset -13 lines).
Hunk #2 succeeded at 932 with fuzz 1 (offset -10 lines).

Now at patch 0011-Fix-volume-level-notification-not-appearing-after-12.patch

NOTE: Applying patch '0012-Support-enabling-avdtp-delayReport.patch' (meta-webosose/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch)
ERROR: Command Error: 'quilt --quiltrc TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/bluez5/5.56-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
stdout: Applying patch 0012-Support-enabling-avdtp-delayReport.patch
patching file profiles/audio/a2dp.c
Hunk #1 succeeded at 2194 (offset 34 lines).
patching file profiles/audio/a2dp.h
Hunk #1 succeeded at 77 (offset -13 lines).
patching file profiles/audio/avdtp.c
Hunk #1 succeeded at 469 (offset -9 lines).
patching file profiles/audio/avdtp.h
Hunk #1 succeeded at 306 (offset -8 lines).
patching file profiles/audio/media.c
Hunk #1 succeeded at 120 (offset -12 lines).
Hunk #2 succeeded at 813 (offset 1 line).
Hunk webosose#3 succeeded at 2430 (offset 1 line).
patching file profiles/audio/media.h
Hunk #1 succeeded at 10 (offset -13 lines).
Hunk #2 succeeded at 23 (offset -13 lines).
patching file src/adapter.c
Hunk #1 FAILED at 78.
Hunk #2 succeeded at 224 (offset -19 lines).
Hunk webosose#3 succeeded at 291 (offset -15 lines).
Hunk webosose#4 succeeded at 497 with fuzz 2 (offset -15 lines).
Hunk webosose#5 succeeded at 3194 with fuzz 2 (offset -17 lines).
Hunk webosose#6 succeeded at 3539 (offset 22 lines).
Hunk webosose#7 succeeded at 4867 (offset -6 lines).
Hunk webosose#8 succeeded at 6319 (offset -6 lines).
Hunk webosose#9 FAILED at 6366.
Hunk webosose#10 succeeded at 6367 (offset -6 lines).
2 out of 10 hunks FAILED -- rejects in file src/adapter.c
patching file src/adapter.h
Hunk #1 succeeded at 25 (offset -8 lines).
Hunk #2 succeeded at 69 (offset -8 lines).
can't find file to patch at input line 302
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
  --------------------------
  |diff --git a/src/hcid.h b/src/hcid.h
  |index 3624ba6ea..8f77184ed 100644
  |--- a/src/hcid.h
  |+++ b/src/hcid.h
  --------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file src/main.c
Hunk #1 succeeded at 76 (offset -12 lines).
Hunk #2 succeeded at 709 with fuzz 2 (offset 74 lines).
patching file src/main.conf
Patch 0012-Support-enabling-avdtp-delayReport.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-124341] Create GPVB with Yocto 3.3 Hardknott
  • Loading branch information
shr-project committed Mar 3, 2021
1 parent 459502a commit 0ec7bc1
Show file tree
Hide file tree
Showing 26 changed files with 279 additions and 278 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dc7618c9f5753c17d3e299e1298665e02ade8c8c Mon Sep 17 00:00:00 2001
From 85c5b7e82355f00499447d9ed5fa71ae1b1e0e6b Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Wed, 11 Apr 2018 11:03:20 +0530
Subject: [PATCH] Fix advertise time out when default is set to zero
Expand All @@ -25,10 +25,10 @@ Change-Id: I60cb0c22991efa61a800b1483e232e42beff2da2
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/advertising.c b/src/advertising.c
index e5f25948d..992bb7533 100644
index 15a343e52..92ab25ed2 100644
--- a/src/advertising.c
+++ b/src/advertising.c
@@ -521,13 +521,18 @@ static bool parse_local_name(DBusMessageIter *iter,
@@ -524,13 +524,18 @@ static bool parse_local_name(DBusMessageIter *iter,
if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING)
return false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0156a926e31ed22dfcca6482bcde0be2d93a2627 Mon Sep 17 00:00:00 2001
From 13029ffccb33fc57ce7777f1d6223ed26fe70f40 Mon Sep 17 00:00:00 2001
From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
Date: Thu, 17 May 2018 18:15:48 +0530
Subject: [PATCH] Send disconnect signal on remote device disconnect
Expand Down Expand Up @@ -26,10 +26,10 @@ Upstream-Status : Pending
1 file changed, 4 insertions(+)

diff --git a/src/profile.c b/src/profile.c
index 6961a107b..0a6ee1beb 100644
index 5e460b639..a287eee66 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -740,6 +740,8 @@ static GSList *custom_props = NULL;
@@ -727,6 +727,8 @@ static GSList *custom_props = NULL;
static GSList *profiles = NULL;
static GSList *ext_profiles = NULL;

Expand All @@ -38,7 +38,7 @@ index 6961a107b..0a6ee1beb 100644
void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),
void *data)
{
@@ -856,6 +858,8 @@ drop:
@@ -843,6 +845,8 @@ drop:
btd_service_disconnecting_complete(conn->service, 0);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e7d89cb337d04b4fdabe781772d67d6226d0f158 Mon Sep 17 00:00:00 2001
From 01a35d286d28e50e2c456dbbe9ce1f8cb9dc5000 Mon Sep 17 00:00:00 2001
From: "vijaya.sundaram" <vijaya.sundaram@lge.com>
Date: Fri, 1 Jun 2018 11:43:15 +0530
Subject: [PATCH] Fetching device type like BLE, BREDR from bluez
Expand All @@ -24,18 +24,18 @@ Upstream-Status : Pending
1 file changed, 17 insertions(+)

diff --git a/src/device.c b/src/device.c
index df440ce09..b3b88daef 100644
index af13badfc..b20906f3c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -218,6 +218,7 @@ struct btd_device {
@@ -205,6 +205,7 @@ struct btd_device {
char name[MAX_NAME_LENGTH + 1];
char *alias;
uint32_t class;
+ uint32_t devicetype;
uint16_t vendor_src;
uint16_t vendor;
uint16_t product;
@@ -881,6 +882,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
@@ -877,6 +878,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
return TRUE;
}

Expand All @@ -57,7 +57,7 @@ index df440ce09..b3b88daef 100644
static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
uint16_t *appearance)
{
@@ -2919,6 +2935,7 @@ static const GDBusMethodTable device_methods[] = {
@@ -2915,6 +2931,7 @@ static const GDBusMethodTable device_methods[] = {
static const GDBusPropertyTable device_properties[] = {
{ "Address", "s", dev_property_get_address },
{ "AddressType", "s", property_get_address_type },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 672a9acc1de2a04fa51bd8c0fb2eedc7f44108a7 Mon Sep 17 00:00:00 2001
From 1d59242d83ee719042e5fb29db074c3320f7c379 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Sun, 22 Jul 2018 18:59:45 +0530
Subject: [PATCH] Fix Gatt connect when device address type is BDADDR_LE_PUBLIC
Expand Down Expand Up @@ -29,10 +29,10 @@ Upstream-Status: Pending
1 file changed, 28 insertions(+)

diff --git a/src/device.c b/src/device.c
index b3b88daef..d320d16b0 100644
index b20906f3c..91dc363e2 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2164,6 +2164,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
@@ -2160,6 +2160,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
return connect_profiles(dev, bdaddr_type, msg, NULL);
}

Expand Down Expand Up @@ -66,7 +66,7 @@ index b3b88daef..d320d16b0 100644
static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
void *user_data)
{
@@ -2923,6 +2950,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
@@ -2919,6 +2946,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
static const GDBusMethodTable device_methods[] = {
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9aea505c51974098acd70f011c6088c45b7a6d5f Mon Sep 17 00:00:00 2001
From 7a4e82c413acf7e510c20e665a92faceb7421c2f Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Thu, 15 Nov 2018 11:08:44 +0530
Subject: [PATCH] Use system bus instead of session for obexd
Expand Down Expand Up @@ -34,10 +34,10 @@ Upstream-Status: Inappropriate[webos specific]
10 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
index 5e30654af..eb7213760 100644
index 160e0636a..f492965b2 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -476,7 +476,8 @@ int ftp_init(void)
@@ -463,7 +463,8 @@ int ftp_init(void)

DBG("");

Expand All @@ -48,10 +48,10 @@ index 5e30654af..eb7213760 100644
return -EIO;

diff --git a/obexd/client/map.c b/obexd/client/map.c
index 23be2d6b2..28e60fe4c 100644
index 74828cddb..ea3d25629 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -2076,7 +2076,7 @@ int map_init(void)
@@ -2063,7 +2063,7 @@ int map_init(void)

DBG("");

Expand All @@ -61,10 +61,10 @@ index 23be2d6b2..28e60fe4c 100644
return -EIO;

diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index 92785f66e..36fd4db16 100644
index 90d0c0c8e..369e9e91c 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -191,7 +191,7 @@ int opp_init(void)
@@ -178,7 +178,7 @@ int opp_init(void)

DBG("");

Expand All @@ -74,10 +74,10 @@ index 92785f66e..36fd4db16 100644
return -EIO;

diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 3f5665fcd..e4b7d5959 100644
index 1a2bacc9f..7e730240f 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -1314,7 +1314,7 @@ int pbap_init(void)
@@ -1301,7 +1301,7 @@ int pbap_init(void)

DBG("");

Expand All @@ -87,10 +87,10 @@ index 3f5665fcd..e4b7d5959 100644
return -EIO;

diff --git a/obexd/client/session.c b/obexd/client/session.c
index 5bd2d2670..cf4cb2c5f 100644
index 6955a8089..9b456f69c 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -596,7 +596,7 @@ struct obc_session *obc_session_create(const char *source,
@@ -583,7 +583,7 @@ struct obc_session *obc_session_create(const char *source,
if (driver == NULL)
return NULL;

Expand All @@ -100,10 +100,10 @@ index 5bd2d2670..cf4cb2c5f 100644
return NULL;

diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index 548c318c3..8c3090879 100644
index 92faf4434..c1147897c 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -237,7 +237,7 @@ int sync_init(void)
@@ -224,7 +224,7 @@ int sync_init(void)

DBG("");

Expand All @@ -113,10 +113,10 @@ index 548c318c3..8c3090879 100644
return -EIO;

diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 43ab409e9..3ea5963c3 100644
index b2232ea09..b5a76c415 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -333,7 +333,7 @@ static gboolean send_backup_dbus_message(const char *oper,
@@ -320,7 +320,7 @@ static gboolean send_backup_dbus_message(const char *oper,

file_size = size ? *size : 0;

Expand All @@ -126,10 +126,10 @@ index 43ab409e9..3ea5963c3 100644
if (conn == NULL)
return FALSE;
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index a4af627cb..61f341711 100644
index 01741fe62..f1fa9fa43 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -499,7 +499,7 @@ gboolean manager_init(void)
@@ -486,7 +486,7 @@ gboolean manager_init(void)

dbus_error_init(&err);

Expand All @@ -139,10 +139,10 @@ index a4af627cb..61f341711 100644
if (dbus_error_is_set(&err) == TRUE) {
fprintf(stderr, "%s\n", err.message);
diff --git a/src/bluetooth.conf b/src/bluetooth.conf
index 8a1e25801..582f492ce 100644
index b6c614908..f8879c8bb 100644
--- a/src/bluetooth.conf
+++ b/src/bluetooth.conf
@@ -20,10 +20,22 @@
@@ -21,10 +21,22 @@
<allow send_interface="org.freedesktop.DBus.ObjectManager"/>
<allow send_interface="org.freedesktop.DBus.Properties"/>
<allow send_interface="org.mpris.MediaPlayer2.Player"/>
Expand All @@ -166,10 +166,10 @@ index 8a1e25801..582f492ce 100644

</busconfig>
diff --git a/tools/obexctl.c b/tools/obexctl.c
index 0709f692c..9ed336aa5 100644
index e671d253b..056701306 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -2152,7 +2152,7 @@ int main(int argc, char *argv[])
@@ -2139,7 +2139,7 @@ int main(int argc, char *argv[])
bt_shell_set_menu(&main_menu);
bt_shell_set_prompt(PROMPT_OFF);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2c599604ea046598159e4e9414945ac91d0ab76e Mon Sep 17 00:00:00 2001
From 6b33f38e65c9248a5eb8fdab0ce3162b52ea7277 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Tue, 22 Jan 2019 23:25:18 +0530
Subject: [PATCH] Implementation to get connected profiles uuids
Expand All @@ -25,18 +25,18 @@ Change-Id: I72834cc9b4bdd8f086565dc9a2a41006f758ad39
1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/device.c b/src/device.c
index d320d16b0..2dca3da12 100644
index 91dc363e2..2e2ae32f7 100644
--- a/src/device.c
+++ b/src/device.c
@@ -227,6 +227,7 @@ struct btd_device {
@@ -214,6 +214,7 @@ struct btd_device {
char *modalias;
struct btd_adapter *adapter;
GSList *uuids;
+ GSList *connected_uuids;
GSList *primaries; /* List of primary services */
GSList *services; /* List of btd_service */
GSList *pending; /* Pending services */
@@ -913,6 +914,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
@@ -909,6 +910,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
return FALSE;
}

Expand Down Expand Up @@ -65,7 +65,7 @@ index d320d16b0..2dca3da12 100644
static gboolean dev_property_exists_appearance(
const GDBusPropertyTable *property, void *data)
{
@@ -1759,8 +1782,14 @@ static void device_profile_connected(struct btd_device *dev,
@@ -1755,8 +1778,14 @@ static void device_profile_connected(struct btd_device *dev,

DBG("%s %s (%d)", profile->name, strerror(-err), -err);

Expand All @@ -81,7 +81,7 @@ index d320d16b0..2dca3da12 100644

if (dev->pending == NULL)
goto done;
@@ -2213,6 +2242,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
@@ -2209,6 +2238,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
static void device_profile_disconnected(struct btd_device *dev,
struct btd_profile *profile, int err)
{
Expand All @@ -96,15 +96,15 @@ index d320d16b0..2dca3da12 100644
if (!dev->disconnect)
return;

@@ -2979,6 +3016,7 @@ static const GDBusPropertyTable device_properties[] = {
@@ -2975,6 +3012,7 @@ static const GDBusPropertyTable device_properties[] = {
{ "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi },
{ "Connected", "b", dev_property_get_connected },
{ "UUIDs", "as", dev_property_get_uuids },
+ { "ConnectedUUIDS", "as", dev_property_get_connected_uuids },
{ "Modalias", "s", dev_property_get_modalias, NULL,
dev_property_exists_modalias },
{ "Adapter", "o", dev_property_get_adapter },
@@ -3056,7 +3094,17 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
@@ -3053,7 +3091,17 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
if (!state->connected)
return;

Expand Down
Loading

0 comments on commit 0ec7bc1

Please sign in to comment.