summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-06-15 08:12:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-16 23:07:05 (GMT)
commita4c38eb05a91b6610e942f792b48ba9f1cb4a6cd (patch)
treeab3e45a2287fdd7fd639fb192598190d87ad9d8b /meta/recipes-connectivity/connman
parent096f60d490891a88a539f096a50fd3fa7ec333b9 (diff)
downloadpoky-a4c38eb05a91b6610e942f792b48ba9f1cb4a6cd.tar.gz
connman: update 1.39 -> 1.40
(From OE-Core rev: a23c6374ad3112f8b0a4bc259c67eb7dd2ae9097) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch10
-rw-r--r--meta/recipes-connectivity/connman/connman_1.40.bb (renamed from meta/recipes-connectivity/connman/connman_1.39.bb)2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 942b9c9..9dca21a 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,4 +1,4 @@
1From c7734e1547db967eccf242fe4b9e8a30b9ff141c Mon Sep 17 00:00:00 2001 1From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 23:02:21 -0700 3Date: Mon, 6 Apr 2015 23:02:21 -0700
4Subject: [PATCH] resolve: musl does not implement res_ninit 4Subject: [PATCH] resolve: musl does not implement res_ninit
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 13 insertions(+), 21 deletions(-) 15 1 file changed, 13 insertions(+), 21 deletions(-)
16 16
17diff --git a/gweb/gresolv.c b/gweb/gresolv.c 17diff --git a/gweb/gresolv.c b/gweb/gresolv.c
18index 38a554e..a9e8740 100644 18index 954e7cf..2a9bc51 100644
19--- a/gweb/gresolv.c 19--- a/gweb/gresolv.c
20+++ b/gweb/gresolv.c 20+++ b/gweb/gresolv.c
21@@ -36,6 +36,7 @@ 21@@ -36,6 +36,7 @@
@@ -26,7 +26,7 @@ index 38a554e..a9e8740 100644
26 26
27 #include "gresolv.h" 27 #include "gresolv.h"
28 28
29@@ -877,8 +878,6 @@ GResolv *g_resolv_new(int index) 29@@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index)
30 resolv->index = index; 30 resolv->index = index;
31 resolv->nameserver_list = NULL; 31 resolv->nameserver_list = NULL;
32 32
@@ -35,7 +35,7 @@ index 38a554e..a9e8740 100644
35 return resolv; 35 return resolv;
36 } 36 }
37 37
38@@ -918,8 +917,6 @@ void g_resolv_unref(GResolv *resolv) 38@@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv)
39 39
40 flush_nameservers(resolv); 40 flush_nameservers(resolv);
41 41
@@ -44,7 +44,7 @@ index 38a554e..a9e8740 100644
44 g_free(resolv); 44 g_free(resolv);
45 } 45 }
46 46
47@@ -1022,24 +1019,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, 47@@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
48 debug(resolv, "hostname %s", hostname); 48 debug(resolv, "hostname %s", hostname);
49 49
50 if (!resolv->nameserver_list) { 50 if (!resolv->nameserver_list) {
diff --git a/meta/recipes-connectivity/connman/connman_1.39.bb b/meta/recipes-connectivity/connman/connman_1.40.bb
index df42e9f..15d105e 100644
--- a/meta/recipes-connectivity/connman/connman_1.39.bb
+++ b/meta/recipes-connectivity/connman/connman_1.40.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
9 9
10SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" 10SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
11 11
12SRC_URI[sha256sum] = "9f62a7169b7491c670a1ff2e335b0d966308fb2f62e285c781105eb90f181af3" 12SRC_URI[sha256sum] = "1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12"
13 13
14RRECOMMENDS_${PN} = "connman-conf" 14RRECOMMENDS_${PN} = "connman-conf"
15RCONFLICTS_${PN} = "networkmanager" 15RCONFLICTS_${PN} = "networkmanager"