On Tue, Jan 05, 2016 at 04:08:13PM +0200, Maxin B. John wrote: > 5.36 -> 5.37 > > Remove the backported patch: > core-profile-Fix-possible-crash-when-registering-pro.patch
Don't you need to remove file://core-profile-Fix-possible-crash-when-registering-pro.patch from SRC_URI when you're removing the file? Can you please add PNBLACKLIST which will blacklist bluez5 when bluez4 is in DISTRO_FEATURES? Like I did for bluez4 in: http://git.openembedded.org/meta-openembedded/commit/?id=73ba7cd70f75a898bf4c3f8ae38c9904fc3e4724 Making bluez4 and bluez5 really mutually exclusive would help with issues like this one: http://lists.openembedded.org/pipermail/openembedded-devel/2016-January/105341.html > Signed-off-by: Maxin B. John <[email protected]> > --- > ...e-Fix-possible-crash-when-registering-pro.patch | 54 > ---------------------- > .../bluez5/{bluez5_5.36.bb => bluez5_5.37.bb} | 5 +- > 2 files changed, 2 insertions(+), 57 deletions(-) > delete mode 100644 > meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch > rename meta/recipes-connectivity/bluez5/{bluez5_5.36.bb => bluez5_5.37.bb} > (83%) > > 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 5c6cee1..0000000 > --- > 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 <[email protected]> > -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.37.bb > similarity index 83% > rename from meta/recipes-connectivity/bluez5/bluez5_5.36.bb > rename to meta/recipes-connectivity/bluez5/bluez5_5.37.bb > index 884bb77..b58423a 100644 > --- a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb > +++ b/meta/recipes-connectivity/bluez5/bluez5_5.37.bb > @@ -1,8 +1,7 @@ > require bluez5.inc > > -SRC_URI += > "file://core-profile-Fix-possible-crash-when-registering-pro.patch" > -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 > # support > -- > 2.4.0 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
