mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 09:49:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

bluez5: upgrade to 5.37

Browse Source 
5.36 -> 5.37

Remove the backported patch:
core-profile-Fix-possible-crash-when-registering-pro.patch

Build bluez5 only when DISTRO_FEATURES include bluez5

(From OE-Core rev: 0a556af62b509f9defd8ac5b3a6648bdfe1dff67)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2016-01-07 16:31:35 +02:00
committed by Richard Purdie
parent 11f5a42936
commit 8f2ab19b25
3 changed files with 5 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-connectivity/bluez5/bluez5.inc
View File

@@ -22,7 +22,7 @@ SRC_URI = "\
" "
S = "${WORKDIR}/bluez-${PV}" S = "${WORKDIR}/bluez-${PV}"
inherit autotools-brokensep pkgconfig systemd update-rc.d inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check
EXTRA_OECONF = "\ EXTRA_OECONF = "\
--enable-tools \ --enable-tools \

54
meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch
View File

@@ -1,54 +0,0 @@
From bc4dbda3362d3654447d8ae6525cac1540b7d705 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 5 Nov 2015 15:14:50 +0200
Subject: [PATCH] core/profile: Fix possible crash when registering profiles
Upstream-Status: Backport
Profiles under ext_profiles are local and should no be mixed with other
external profiles since its type is different which can may cause invalid
memory when accessing member of ext_profile struct.
---
src/profile.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/profile.c b/src/profile.c
index 49445d7..5a4f09c 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -719,19 +719,13 @@ void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),
int btd_profile_register(struct btd_profile *profile)
{
- if (profile->external)
- ext_profiles = g_slist_append(ext_profiles, profile);
- else
- profiles = g_slist_append(profiles, profile);
+ profiles = g_slist_append(profiles, profile);
return 0;
}
void btd_profile_unregister(struct btd_profile *profile)
{
- if (profile->external)
- ext_profiles = g_slist_remove(ext_profiles, profile);
- else
- profiles = g_slist_remove(profiles, profile);
+ profiles = g_slist_remove(profiles, profile);
}
static struct ext_profile *find_ext_profile(const char *owner,
@@ -742,10 +736,6 @@ static struct ext_profile *find_ext_profile(const char *owner,
for (l = ext_profiles; l != NULL; l = g_slist_next(l)) {
struct ext_profile *ext = l->data;
- /*
- * Owner and path can be NULL if profile was registered by a
- * plugin using external flag.
- */
if (g_strcmp0(ext->owner, owner))
continue;
--
2.5.0

7
meta/recipes-connectivity/bluez5/bluez5_5.36.bb → meta/recipes-connectivity/bluez5/bluez5_5.37.bb
View File

@@ -1,8 +1,9 @@
require bluez5.inc require bluez5.inc
SRC_URI += "file://core-profile-Fix-possible-crash-when-registering-pro.patch" REQUIRED_DISTRO_FEATURES = "bluez5"
SRC_URI[md5sum] = "9a0ee479cacc44fac68f6a65b1cd3eba"
SRC_URI[sha256sum] = "a343ea1aeb53d3bd139087f3b1c1e1fb70db452d9762cc7a3d23e75962e578f2" SRC_URI[md5sum] = "33177e5743e24b2b3738f72be64e3ffb"
SRC_URI[sha256sum] = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"
# noinst programs in Makefile.tools that are conditional on READLINE # noinst programs in Makefile.tools that are conditional on READLINE
# support # support