From 0a556af62b509f9defd8ac5b3a6648bdfe1dff67 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Thu, 7 Jan 2016 16:31:35 +0200 Subject: bluez5: upgrade to 5.37 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 Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 +- ...e-Fix-possible-crash-when-registering-pro.patch | 54 --------------------- meta/recipes-connectivity/bluez5/bluez5_5.36.bb | 54 --------------------- meta/recipes-connectivity/bluez5/bluez5_5.37.bb | 55 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 109 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.36.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.37.bb diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 3aaefa366c..ff2bdcba62 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -22,7 +22,7 @@ SRC_URI = "\ " 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 = "\ --enable-tools \ diff --git a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch b/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch deleted file mode 100644 index 5c6cee1cff..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc4dbda3362d3654447d8ae6525cac1540b7d705 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -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 - diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb b/meta/recipes-connectivity/bluez5/bluez5_5.36.bb deleted file mode 100644 index 884bb7760e..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb +++ /dev/null @@ -1,54 +0,0 @@ -require bluez5.inc - -SRC_URI += "file://core-profile-Fix-possible-crash-when-registering-pro.patch" -SRC_URI[md5sum] = "9a0ee479cacc44fac68f6a65b1cd3eba" -SRC_URI[sha256sum] = "a343ea1aeb53d3bd139087f3b1c1e1fb70db452d9762cc7a3d23e75962e578f2" - -# noinst programs in Makefile.tools that are conditional on READLINE -# support -NOINST_TOOLS_READLINE ?= " \ - attrib/gatttool \ - tools/obex-client-tool \ - tools/obex-server-tool \ - tools/bluetooth-player \ - tools/obexctl \ -" - -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL -# support -NOINST_TOOLS_EXPERIMENTAL ?= " \ - emulator/btvirt \ - emulator/b1ee \ - emulator/hfp \ - tools/3dsp \ - tools/mgmt-tester \ - tools/gap-tester \ - tools/l2cap-tester \ - tools/sco-tester \ - tools/smp-tester \ - tools/hci-tester \ - tools/rfcomm-tester \ - tools/bdaddr \ - tools/avinfo \ - tools/avtest \ - tools/scotest \ - tools/amptest \ - tools/hwdb \ - tools/hcieventmask \ - tools/hcisecfilter \ - tools/btmgmt \ - tools/btinfo \ - tools/btattach \ - tools/btsnoop \ - tools/btproxy \ - tools/btiotest \ - tools/mcaptest \ - tools/cltest \ - tools/oobtest \ - tools/seq2bseq \ - tools/ibeacon \ - tools/btgatt-client \ - tools/btgatt-server \ - tools/gatt-service \ - profiles/iap/iapd \ -" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.37.bb b/meta/recipes-connectivity/bluez5/bluez5_5.37.bb new file mode 100644 index 0000000000..db20f79ffa --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.37.bb @@ -0,0 +1,55 @@ +require bluez5.inc + +REQUIRED_DISTRO_FEATURES = "bluez5" + +SRC_URI[md5sum] = "33177e5743e24b2b3738f72be64e3ffb" +SRC_URI[sha256sum] = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ + attrib/gatttool \ + tools/obex-client-tool \ + tools/obex-server-tool \ + tools/bluetooth-player \ + tools/obexctl \ +" + +# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL +# support +NOINST_TOOLS_EXPERIMENTAL ?= " \ + emulator/btvirt \ + emulator/b1ee \ + emulator/hfp \ + tools/3dsp \ + tools/mgmt-tester \ + tools/gap-tester \ + tools/l2cap-tester \ + tools/sco-tester \ + tools/smp-tester \ + tools/hci-tester \ + tools/rfcomm-tester \ + tools/bdaddr \ + tools/avinfo \ + tools/avtest \ + tools/scotest \ + tools/amptest \ + tools/hwdb \ + tools/hcieventmask \ + tools/hcisecfilter \ + tools/btmgmt \ + tools/btinfo \ + tools/btattach \ + tools/btsnoop \ + tools/btproxy \ + tools/btiotest \ + tools/mcaptest \ + tools/cltest \ + tools/oobtest \ + tools/seq2bseq \ + tools/ibeacon \ + tools/btgatt-client \ + tools/btgatt-server \ + tools/gatt-service \ + profiles/iap/iapd \ +" -- cgit 1.2.3-korg