summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-10-03 11:01:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-04 13:21:41 (GMT)
commit9cdc0f090c690a06785b57136cc8026f004be6a8 (patch)
tree9e24942e64057f6b848dbe689ec46c663573004e /meta/recipes-connectivity/connman
parent637d3c3555fd92f4ed51a95f9592a57d08feb345 (diff)
downloadpoky-9cdc0f090c690a06785b57136cc8026f004be6a8.tar.gz
connman: neaten patches
The upstreamable include-tweaking patches contained fragments that should be in the not-upstreamable musl-specific res_ninit replacement, so move them to the right patch. (From OE-Core rev: 18fd5bc97e6b061eec4be0738f20fcbace6bdafe) Signed-off-by: Ross Burton <ross.burton@intel.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.patch8
-rw-r--r--meta/recipes-connectivity/connman/connman/includes.patch12
2 files changed, 11 insertions, 9 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 0593427..639ccfa 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
@@ -17,6 +17,14 @@ diff --git a/gweb/gresolv.c b/gweb/gresolv.c
17index 5cf7a9a..3ad8e70 100644 17index 5cf7a9a..3ad8e70 100644
18--- a/gweb/gresolv.c 18--- a/gweb/gresolv.c
19+++ b/gweb/gresolv.c 19+++ b/gweb/gresolv.c
20@@ -36,6 +36,7 @@
21 #include <arpa/inet.h>
22 #include <arpa/nameser.h>
23 #include <net/if.h>
24+#include <ctype.h>
25
26 #include "gresolv.h"
27
20@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index) 28@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
21 resolv->index = index; 29 resolv->index = index;
22 resolv->nameserver_list = NULL; 30 resolv->nameserver_list = NULL;
diff --git a/meta/recipes-connectivity/connman/connman/includes.patch b/meta/recipes-connectivity/connman/connman/includes.patch
index 55cb187..dcce5be 100644
--- a/meta/recipes-connectivity/connman/connman/includes.patch
+++ b/meta/recipes-connectivity/connman/connman/includes.patch
@@ -300,20 +300,14 @@ diff --git a/gweb/gresolv.c b/gweb/gresolv.c
300index 8a51a9f..d55027c 100644 300index 8a51a9f..d55027c 100644
301--- a/gweb/gresolv.c 301--- a/gweb/gresolv.c
302+++ b/gweb/gresolv.c 302+++ b/gweb/gresolv.c
303@@ -23,11 +23,13 @@ 303@@ -29,6 +29,7 @@
304 #include <config.h>
305 #endif
306
307+#include <ctype.h>
308 #include <errno.h>
309 #include <unistd.h>
310 #include <stdarg.h>
311 #include <string.h> 304 #include <string.h>
312 #include <stdlib.h> 305 #include <stdlib.h>
313+#include <stdio.h>
314 #include <resolv.h> 306 #include <resolv.h>
307+#include <stdio.h>
315 #include <sys/types.h> 308 #include <sys/types.h>
316 #include <sys/socket.h> 309 #include <sys/socket.h>
310 #include <netdb.h>
317diff --git a/plugins/wifi.c b/plugins/wifi.c 311diff --git a/plugins/wifi.c b/plugins/wifi.c
318index 9d56671..148131d 100644 312index 9d56671..148131d 100644
319--- a/plugins/wifi.c 313--- a/plugins/wifi.c