[PATCH 1/2] bluez5: upgrade to 5.37

[PATCH 1/2] bluez5: upgrade to 5.37

[Maxin B. John]

5.36 -> 5.37

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

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 ...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 <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
-
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

[PATCH 2/2] connman: upgrade to 1.31

[Maxin B. John]

1.30 -> 1.31

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 .../recipes-connectivity/connman/{connman_1.30.bb => connman_1.31.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/connman/{connman_1.30.bb => connman_1.31.bb} (77%)

diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/meta/recipes-connectivity/connman/connman_1.31.bb
similarity index 77%
rename from meta/recipes-connectivity/connman/connman_1.30.bb
rename to meta/recipes-connectivity/connman/connman_1.31.bb
index 7d65ac9..7b6bcfb 100644
--- a/meta/recipes-connectivity/connman/connman_1.30.bb
+++ b/meta/recipes-connectivity/connman/connman_1.31.bb
@@ -7,8 +7,8 @@ SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
             file://0003-Fix-header-inclusions-for-musl.patch \
             file://connman \
             "
-SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa"
-SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991"
+SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"
+SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2"
 
 RRECOMMENDS_${PN} = "connman-conf"
 
-- 
2.4.0

Re: [PATCH 2/2] connman: upgrade to 1.31

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

On 5 January 2016 at 14:08, Maxin B. John <maxin.john@intel.com> wrote:

> 1.30 -> 1.31
>

I saw this on one of my builds locally:

ERROR: QA Issue: connman: Files/directories were installed but not shipped
in any package:
  /lib/systemd/system/connman-wait-online.service
  /usr/lib/tmpfiles.d
  /usr/lib/tmpfiles.d/connman_resolvconf.conf

I've not looked into what exactly was different between this build and
others where it doesn't happen, but presumably it's detecting something in
the sysroot and enabling these files.

Ross

[-- Attachment #2: Type: text/html, Size: 1272 bytes --]

Re: [PATCH 1/2] bluez5: upgrade to 5.37

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4746 bytes --]

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 <maxin.john@intel.com>
> ---
>  ...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 <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
> -
> 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
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 1/2] bluez5: upgrade to 5.37

[Maxin B. John]

Hi Martin,

On Tue, Jan 05, 2016 at 04:01:24PM +0100, Martin Jansa wrote:
> 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?

Yes, that change is present in the patch (based on "ross/mut" branch)

> Can you please add PNBLACKLIST which will blacklist bluez5 when bluez4
> is in DISTRO_FEATURES?

Sure, will do that.

> 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

Thank you very much for the comments. Will include these changes in v2.

> > Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > ---
> >  ...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%)

<snip>

> > -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"

Best Regards,
Maxin