[PATCH 1/3] ofono: update to 1.18

[PATCH 1/3] ofono: update to 1.18

[Maxin B. John]

1.17 -> 1.18

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 meta/recipes-connectivity/ofono/{ofono_1.17.bb => ofono_1.18.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/ofono/{ofono_1.17.bb => ofono_1.18.bb} (59%)

diff --git a/meta/recipes-connectivity/ofono/ofono_1.17.bb b/meta/recipes-connectivity/ofono/ofono_1.18.bb
similarity index 59%
rename from meta/recipes-connectivity/ofono/ofono_1.17.bb
rename to meta/recipes-connectivity/ofono/ofono_1.18.bb
index 947f9d7..79d3dd0 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.17.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.18.bb
@@ -5,7 +5,7 @@ SRC_URI  = "\
   file://ofono \
   file://Revert-test-Convert-to-Python-3.patch \
 "
-SRC_URI[md5sum] = "d280b1d267ba5bf391d2a898fea7c748"
-SRC_URI[sha256sum] = "cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635"
+SRC_URI[md5sum] = "0a6b37c8ace891cb2a7ca5d121043a0a"
+SRC_URI[sha256sum] = "53cdbf342913f46bce4827241c60e24255a3d43a94945edf77482ae5b312d51f"
 
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
-- 
2.4.0

[PATCH 2/3] connman: update to version 1.32

[Maxin B. John]

Removed following upstreamed/backported patches:
        a) 0001-Detect-backtrace-API-availability-before-using-it.patch
        b) 0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch

Rearranged musl related patches.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 ...acktrace-API-availability-before-using-it.patch | 55 ----------------------
 ...d-missing-function-item-of-xtables-to-mat.patch | 42 -----------------
 meta/recipes-connectivity/connman/connman_1.31.bb  | 15 ------
 meta/recipes-connectivity/connman/connman_1.32.bb  | 15 ++++++
 4 files changed, 15 insertions(+), 112 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman_1.31.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.32.bb

diff --git a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
deleted file mode 100644
index 5dc6fd6..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 00d4447395725abaa651e12ed40095081e04011e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 13 Sep 2015 13:22:01 -0700
-Subject: [PATCH 1/3] Detect backtrace() API availability before using it
-
-C libraries besides glibc do not have backtrace() implemented
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- configure.ac | 2 ++
- src/log.c    | 5 ++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 69c0eeb..90099f2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,6 +171,8 @@ fi
- AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no")
- AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin")
- 
-+AC_CHECK_HEADERS([execinfo.h])
-+
- AC_CHECK_HEADERS(resolv.h, dummy=yes,
- 	AC_MSG_ERROR(resolver header files are required))
- AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [
-diff --git a/src/log.c b/src/log.c
-index a693bd0..5b40c1f 100644
---- a/src/log.c
-+++ b/src/log.c
-@@ -30,7 +30,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <dlfcn.h>
- 
- #include "connman.h"
-@@ -215,9 +214,9 @@ static void print_backtrace(unsigned int offset)
- static void signal_handler(int signo)
- {
- 	connman_error("Aborting (signal %d) [%s]", signo, program_exec);
--
-+#ifdef HAVE_EXECINFO_H
- 	print_backtrace(2);
--
-+#endif /* HAVE_EXECINFO_H */
- 	exit(EXIT_FAILURE);
- }
- 
--- 
-2.5.1
-
diff --git a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch b/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
deleted file mode 100644
index 1b5a3e4..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
-From: Wu Zheng <wu.zheng@intel.com>
-Date: Thu, 28 Jan 2016 18:04:17 +0800
-Subject: [PATCH] iptables: Add missing function item of xtables to match
- iptables 1.6
-
-The struct of xtables_globals has been modified in iptables 1.6.
-If connman runs with iptables 1.6, it can crash.
-
-Program received signal SIGSEGV, Segmentation fault.
-0x00000000 in ?? ()
-0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
-0xb7deac1c in ?? () from /usr/lib/libxtables.so.11
-0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
-
-The the missing function item of xtables is added to xtables_globals.
-
-Upstream-Status: Backport
-
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
-Signed-off-by: Wu Zheng <wu.zheng@intel.com>
----
- src/iptables.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/iptables.c b/src/iptables.c
-index bc0c763..5ef757a 100644
---- a/src/iptables.c
-+++ b/src/iptables.c
-@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = {
- 	.option_offset = 0,
- 	.opts = iptables_opts,
- 	.orig_opts = iptables_opts,
-+#if XTABLES_VERSION_CODE > 10
-+	.compat_rev = xtables_compatible_revision,
-+#endif
- };
- 
- static struct xtables_target *prepare_target(struct connman_iptables *table,
--- 
-2.4.0
-
diff --git a/meta/recipes-connectivity/connman/connman_1.31.bb b/meta/recipes-connectivity/connman/connman_1.31.bb
deleted file mode 100644
index e71d221..0000000
--- a/meta/recipes-connectivity/connman/connman_1.31.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require connman.inc
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-            file://0001-Detect-backtrace-API-availability-before-using-it.patch \
-            file://0002-resolve-musl-does-not-implement-res_ninit.patch \
-            file://0003-Fix-header-inclusions-for-musl.patch \
-            file://0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch \
-            file://connman \
-            "
-SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"
-SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2"
-
-RRECOMMENDS_${PN} = "connman-conf"
-
diff --git a/meta/recipes-connectivity/connman/connman_1.32.bb b/meta/recipes-connectivity/connman/connman_1.32.bb
new file mode 100644
index 0000000..532b17c
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.32.bb
@@ -0,0 +1,15 @@
+require connman.inc
+
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+            file://connman \
+            "
+SRC_URI_append_libc-musl = "file://0002-resolve-musl-does-not-implement-res_ninit.patch \
+                            file://0003-Fix-header-inclusions-for-musl.patch \
+                           "
+
+SRC_URI[md5sum] = "d0c3071c1d8dec9cd17b760f862de2ad"
+SRC_URI[sha256sum] = "3185864c73206a6033d12e9f583689dcd03f714a40a58333709d3f74a4e0934c"
+
+RRECOMMENDS_${PN} = "connman-conf"
+
-- 
2.4.0

[PATCH 3/3] mmc-utils: update to latest git version

[Maxin B. John]

LIC_FILES_CHKSUM has changed due to modifications related to
field firmware update support. However, License remains the same.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 64b8910..0a8da19 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -1,10 +1,10 @@
 SUMMARY = "Userspace tools for MMC/SD devices"
 HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0"
+LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "44f94b925894577f9ffcf2c418dd013a5e582648"
+SRCREV = "bb779acfc385d135b32a6998c1d1fceef0491400"
 
 PV = "0.1"
 
-- 
2.4.0

Re: [PATCH 1/3] ofono: update to 1.18

[Richard Purdie]

On Thu, 2016-05-12 at 16:16 +0300, Maxin B. John wrote:
> 1.17 -> 1.18
> 
> Signed-off-by: Maxin B. John <maxin.john@intel.com>

This results in:

http://errors.yoctoproject.org/Errors/Details/62886/

which Alexander would probably be quite pleased about but isn't good
for the autobuilder.

Cheers,

Richard

Re: [PATCH 1/3] ofono: update to 1.18

[Alexander Kanavin]

On 05/14/2016 09:23 AM, Richard Purdie wrote:
> On Thu, 2016-05-12 at 16:16 +0300, Maxin B. John wrote:
>> 1.17 -> 1.18
>>
>> Signed-off-by: Maxin B. John <maxin.john@intel.com>
>
> This results in:
>
> http://errors.yoctoproject.org/Errors/Details/62886/
>
> which Alexander would probably be quite pleased about but isn't good
> for the autobuilder.

Maxin can cherry-pick one of my patches, or just postpone the version 
update until the py3 patchset is merged:

https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akanavin/deprecate-python2&id=6f7eac37a25f1ab55a28cac7b15674dcd6962404

Alex

Re: [PATCH 1/3] ofono: update to 1.18

[Maxin B. John]

Hi,

On Mon, May 16, 2016 at 02:46:40PM +0300, Alexander Kanavin wrote:
> On 05/14/2016 09:23 AM, Richard Purdie wrote:
> >On Thu, 2016-05-12 at 16:16 +0300, Maxin B. John wrote:
> >>1.17 -> 1.18
> >>
> >>Signed-off-by: Maxin B. John <maxin.john@intel.com>
> >
> >This results in:
> >
> >http://errors.yoctoproject.org/Errors/Details/62886/
> >
> >which Alexander would probably be quite pleased about but isn't good
> >for the autobuilder.
> 
> Maxin can cherry-pick one of my patches, or just postpone the version update
> until the py3 patchset is merged:
> 
> https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akanavin/deprecate-python2&id=6f7eac37a25f1ab55a28cac7b15674dcd6962404

I have tried this patch before sending the upgrades and had to abandon the
attempt because of the newly introduced dependency on python3-pygobject. 

Guess the best way forward will be to wait till py3 patchset is merged :)

> Alex

Thanks and Regards,
Maxin

Re: [PATCH 1/3] ofono: update to 1.18

[Alexander Kanavin]

On 05/16/2016 02:54 PM, Maxin B. John wrote:

>> Maxin can cherry-pick one of my patches, or just postpone the version update
>> until the py3 patchset is merged:
>>
>> https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akanavin/deprecate-python2&id=6f7eac37a25f1ab55a28cac7b15674dcd6962404
>
> I have tried this patch before sending the upgrades and had to abandon the
> attempt because of the newly introduced dependency on python3-pygobject.
>
> Guess the best way forward will be to wait till py3 patchset is merged :)

That's right; oe-core will move python-pygobject to python 3, all 
dependent oe-core recipes will be moved to use that, and original 
py2-based python-pygobject will be added to meta-oe to avoid breakage in 
3rd party layers (and it needs fixing because it installs same files in 
same locations as py3 based version).

The whole thing snowballs pretty quickly, and I'm not even attempting to 
move meta-oe to python 3.

Alex