diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-10-03 12:01:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-03 16:31:50 +0100 |
| commit | 18fd5bc97e6b061eec4be0738f20fcbace6bdafe (patch) | |
| tree | f84e26f2080432641e6b41769960754423557c7d | |
| parent | a7005a4fc5f29db796b1d258b7c259b9433848ce (diff) | |
| download | openembedded-core-18fd5bc97e6b061eec4be0738f20fcbace6bdafe.tar.gz openembedded-core-18fd5bc97e6b061eec4be0738f20fcbace6bdafe.tar.bz2 openembedded-core-18fd5bc97e6b061eec4be0738f20fcbace6bdafe.zip | |
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>
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch | 8 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/includes.patch | 12 |
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 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 |