From 18fd5bc97e6b061eec4be0738f20fcbace6bdafe Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 3 Oct 2018 12:01:36 +0100
Subject: 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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../0002-resolve-musl-does-not-implement-res_ninit.patch     |  8 ++++++++
 meta/recipes-connectivity/connman/connman/includes.patch     | 12 +++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'meta/recipes-connectivity')

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 0593427710..639ccfa2a2 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
 index 5cf7a9a..3ad8e70 100644
 --- a/gweb/gresolv.c
 +++ b/gweb/gresolv.c
+@@ -36,6 +36,7 @@
+ #include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <net/if.h>
++#include <ctype.h>
+ 
+ #include "gresolv.h"
+ 
 @@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
  	resolv->index = index;
  	resolv->nameserver_list = NULL;
diff --git a/meta/recipes-connectivity/connman/connman/includes.patch b/meta/recipes-connectivity/connman/connman/includes.patch
index 55cb187931..dcce5bea12 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
 index 8a51a9f..d55027c 100644
 --- a/gweb/gresolv.c
 +++ b/gweb/gresolv.c
-@@ -23,11 +23,13 @@
- #include <config.h>
- #endif
- 
-+#include <ctype.h>
- #include <errno.h>
- #include <unistd.h>
- #include <stdarg.h>
+@@ -29,6 +29,7 @@
  #include <string.h>
  #include <stdlib.h>
-+#include <stdio.h>
  #include <resolv.h>
++#include <stdio.h>
  #include <sys/types.h>
  #include <sys/socket.h>
+ #include <netdb.h>
 diff --git a/plugins/wifi.c b/plugins/wifi.c
 index 9d56671..148131d 100644
 --- a/plugins/wifi.c
-- 
cgit 1.2.3-korg