summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-08-16 11:49:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 09:40:27 (GMT)
commitfa231eaf9b2865d42e5b5eb7944da65a97693cc9 (patch)
tree187cdc1ac6c89ac931043c42c57b9bb66f1657de /meta/recipes-connectivity/connman
parent91d7311056fd003b359cfa209919415207797962 (diff)
downloadpoky-fa231eaf9b2865d42e5b5eb7944da65a97693cc9.tar.gz
connman: Remove musl patch that's no longer needed
libc headers now have a backported patch that fixes this. (From OE-Core rev: 5dc1700ec6ff15aefb8ca540e5b7d3e89a14945b) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch81
-rw-r--r--meta/recipes-connectivity/connman/connman_1.34.bb2
2 files changed, 1 insertions, 82 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch b/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch
deleted file mode 100644
index da5756e..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 594b67df7ca923d13265906a71fbbf748273a5f5 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 23 Jan 2017 17:41:39 +0200
4Subject: [PATCH] Fix compile on musl with kernel 4.9 headers
5
6Kernel headers break when musl defines IFF_LOWER_UP. While
7waiting for more proper fix in musl, add a hack to connman.
8
9Upstream-Status: Inappropriate [Workaround]
10
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 src/6to4.c | 4 ++++
15 src/firewall-iptables.c | 4 ++++
16 src/firewall-nftables.c | 3 +++
17 src/iptables.c | 4 ++++
18 4 files changed, 15 insertions(+)
19
20diff --git a/src/6to4.c b/src/6to4.c
21index 71a2882..1938afb 100644
22--- a/src/6to4.c
23+++ b/src/6to4.c
24@@ -24,6 +24,10 @@
25 #include <config.h>
26 #endif
27
28+/* hack to make sure kernel headers understand that libc (musl)
29+ does define IFF_LOWER_UP et al. */
30+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
31+
32 #include <errno.h>
33 #include <stdio.h>
34 #include <stdlib.h>
35diff --git a/src/firewall-iptables.c b/src/firewall-iptables.c
36index 45943a8..e04bb91 100644
37--- a/src/firewall-iptables.c
38+++ b/src/firewall-iptables.c
39@@ -23,6 +23,10 @@
40 #include <config.h>
41 #endif
42
43+/* hack to make sure kernel headers understand that libc (musl)
44+ does define IFF_LOWER_UP et al. */
45+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
46+
47 #include <errno.h>
48
49 #include <xtables.h>
50diff --git a/src/firewall-nftables.c b/src/firewall-nftables.c
51index 2503ee2..583d1c4 100644
52--- a/src/firewall-nftables.c
53+++ b/src/firewall-nftables.c
54@@ -30,6 +30,9 @@
55 #ifdef HAVE_CONFIG_H
56 #include <config.h>
57 #endif
58+/* hack to make sure kernel headers understand that libc (musl)
59+ does define IFF_LOWER_UP et al. */
60+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
61
62 #include <stdlib.h>
63 #include <time.h>
64diff --git a/src/iptables.c b/src/iptables.c
65index 82e3ac4..46ad9e2 100644
66--- a/src/iptables.c
67+++ b/src/iptables.c
68@@ -23,6 +23,10 @@
69 #include <config.h>
70 #endif
71
72+/* hack to make sure kernel headers understand that libc (musl)
73+ does define IFF_LOWER_UP et al. */
74+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
75+
76 #include <getopt.h>
77 #include <stdlib.h>
78 #include <stdio.h>
79--
802.4.0
81
diff --git a/meta/recipes-connectivity/connman/connman_1.34.bb b/meta/recipes-connectivity/connman/connman_1.34.bb
index d520568..868f940 100644
--- a/meta/recipes-connectivity/connman/connman_1.34.bb
+++ b/meta/recipes-connectivity/connman/connman_1.34.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
9 file://includes.patch \ 9 file://includes.patch \
10 " 10 "
11SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \ 11SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \
12 file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch" 12 "
13 13
14SRC_URI[md5sum] = "e200028702c831d5f535d20d61e608ef" 14SRC_URI[md5sum] = "e200028702c831d5f535d20d61e608ef"
15SRC_URI[sha256sum] = "a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e" 15SRC_URI[sha256sum] = "a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e"