diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-10-17 16:11:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-10-19 09:23:08 -0700 |
commit | 18986aadb59954d166771792078bc60f49607c32 (patch) | |
tree | 17b097b4c5c3b5f29dacbdca30b667291f260542 /meta-oe | |
parent | 2ed3c4fd447f2ff8e95017f6993a13562a4e7d5e (diff) | |
download | meta-openembedded-contrib-18986aadb59954d166771792078bc60f49607c32.tar.gz |
iwd: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd_1.18.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch new file mode 100644 index 0000000000..a9f2393532 --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch @@ -0,0 +1,38 @@ +From 36c74f974eba6f276ed4dd04c2077e6f23ebec37 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 17 Oct 2021 16:09:03 -0700 +Subject: [PATCH] netconfig: Use s6_addr instead of __in6_u.__u6_addr8 + +Building fails with: + +../iwd-1.18/src/netconfig.c: In function 'netconfig_ipv6_to_string': +../iwd-1.18/src/netconfig.c:188:25: error: 'struct in6_addr' has no member named '__in6_u'; did you mean '__in6_union'? + 188 | memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); + | ^~~~~~~ + | __in6_union + +Can be fixed by changing &this_ip.__in6_u.__u6_addr8[0] with &this_ip.s6_addr[0]. +For references: in6_addr is declared in /usr/include/linux/in6.h + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/netconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/netconfig.c b/src/netconfig.c +index c748630..ab51c3d 100644 +--- a/src/netconfig.c ++++ b/src/netconfig.c +@@ -185,7 +185,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) + struct in6_addr in6_addr; + char *addr_str = l_malloc(INET6_ADDRSTRLEN); + +- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); ++ memcpy(in6_addr.s6_addr, addr, 16); + + if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, + INET6_ADDRSTRLEN)))) { +-- +2.33.1 + diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb index 8d58a7a84b..4136de84fa 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.18.bb @@ -7,6 +7,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ + file://0001-netconfig-Use-s6_addr-instead-of-__in6_u.__u6_addr8.patch \ " SRC_URI[sha256sum] = "0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55" |