summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-07-22 17:08:05 +0300
committerSaul Wold <sgw@linux.intel.com>2013-07-25 23:44:27 -0700
commit9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c (patch)
tree8efec8dbe69b285d58d1ff51d7794b660c577446 /meta/recipes-connectivity
parentd79521cf1777276a5e85d59f9e078f4d6d9603aa (diff)
downloadopenembedded-core-9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c.tar.gz
openembedded-core-9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c.tar.bz2
openembedded-core-9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c.zip
connman: upgrade to v1.16
inet-fix-ip-cleanup-functions.patch no longer nedded; included in upstream. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch40
-rw-r--r--meta/recipes-connectivity/connman/connman_1.16.bb (renamed from meta/recipes-connectivity/connman/connman_1.15.bb)5
2 files changed, 2 insertions, 43 deletions
diff --git a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
deleted file mode 100644
index 3071549d95..0000000000
--- a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 100353e10f60a50ca1ba78daa6bc4dfebf5b3297 Mon Sep 17 00:00:00 2001
-From: Constantin Musca <constantinx.musca@intel.com>
-Date: Wed, 5 Dec 2012 15:07:21 +0200
-Subject: [PATCH] inet: fix ip cleanup functions
-
-Upstream-Status: Pending
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
----
- src/inet.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/inet.c b/src/inet.c
-index be69aca..e76a1f1 100644
---- a/src/inet.c
-+++ b/src/inet.c
-@@ -626,6 +626,10 @@ int connman_inet_clear_ipv6_address(int index, const char *address,
-
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
-
-+ if (address == NULL) {
-+ return -1;
-+ }
-+
- err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET6,
- address, NULL, prefix_len, NULL);
- if (err < 0) {
-@@ -649,6 +653,10 @@ int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress)
-
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
-
-+ if (address == NULL) {
-+ return -1;
-+ }
-+
- err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET,
- address, peer, prefix_len, broadcast);
- if (err < 0) {
---
-1.7.11.7
-
diff --git a/meta/recipes-connectivity/connman/connman_1.15.bb b/meta/recipes-connectivity/connman/connman_1.16.bb
index 0ec29c9a42..7e54bc2df6 100644
--- a/meta/recipes-connectivity/connman/connman_1.15.bb
+++ b/meta/recipes-connectivity/connman/connman_1.16.bb
@@ -4,11 +4,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://add_xuser_dbus_permission.patch \
file://connman \
- file://inet-fix-ip-cleanup-functions.patch \
"
-SRC_URI[md5sum] = "e785c0c4564bfffb5215272f1be6f17c"
-SRC_URI[sha256sum] = "8229cc5e3e75197453ba2a644c03860a7cf9f4f27fcbf111bb589530d4efb58f"
+SRC_URI[md5sum] = "d2906816222219e10426442d07c3f4c1"
+SRC_URI[sha256sum] = "7273e88e6a6338be1e51b0e4c685d556386897cba9317cd83370bfb3f009982a"
PR = "${INC_PR}.0"