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 <[email protected]> --- .../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(-) 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 05934277105..639ccfa2a20 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 55cb187931b..dcce5bea122 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 -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
