From fa231eaf9b2865d42e5b5eb7944da65a97693cc9 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 16 Aug 2017 14:49:11 +0300 Subject: 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 Signed-off-by: Richard Purdie --- ...x-compile-on-musl-with-kernel-4.9-headers.patch | 81 ---------------------- meta/recipes-connectivity/connman/connman_1.34.bb | 2 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch (limited to 'meta/recipes-connectivity/connman') 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 da5756e9d5..0000000000 --- a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 594b67df7ca923d13265906a71fbbf748273a5f5 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 23 Jan 2017 17:41:39 +0200 -Subject: [PATCH] Fix compile on musl with kernel 4.9 headers - -Kernel headers break when musl defines IFF_LOWER_UP. While -waiting for more proper fix in musl, add a hack to connman. - -Upstream-Status: Inappropriate [Workaround] - -Signed-off-by: Jussi Kukkonen -Signed-off-by: Maxin B. John ---- - src/6to4.c | 4 ++++ - src/firewall-iptables.c | 4 ++++ - src/firewall-nftables.c | 3 +++ - src/iptables.c | 4 ++++ - 4 files changed, 15 insertions(+) - -diff --git a/src/6to4.c b/src/6to4.c -index 71a2882..1938afb 100644 ---- a/src/6to4.c -+++ b/src/6to4.c -@@ -24,6 +24,10 @@ - #include - #endif - -+/* hack to make sure kernel headers understand that libc (musl) -+ does define IFF_LOWER_UP et al. */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #include - #include - #include -diff --git a/src/firewall-iptables.c b/src/firewall-iptables.c -index 45943a8..e04bb91 100644 ---- a/src/firewall-iptables.c -+++ b/src/firewall-iptables.c -@@ -23,6 +23,10 @@ - #include - #endif - -+/* hack to make sure kernel headers understand that libc (musl) -+ does define IFF_LOWER_UP et al. */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #include - - #include -diff --git a/src/firewall-nftables.c b/src/firewall-nftables.c -index 2503ee2..583d1c4 100644 ---- a/src/firewall-nftables.c -+++ b/src/firewall-nftables.c -@@ -30,6 +30,9 @@ - #ifdef HAVE_CONFIG_H - #include - #endif -+/* hack to make sure kernel headers understand that libc (musl) -+ does define IFF_LOWER_UP et al. */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 - - #include - #include -diff --git a/src/iptables.c b/src/iptables.c -index 82e3ac4..46ad9e2 100644 ---- a/src/iptables.c -+++ b/src/iptables.c -@@ -23,6 +23,10 @@ - #include - #endif - -+/* hack to make sure kernel headers understand that libc (musl) -+ does define IFF_LOWER_UP et al. */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #include - #include - #include --- -2.4.0 - diff --git a/meta/recipes-connectivity/connman/connman_1.34.bb b/meta/recipes-connectivity/connman/connman_1.34.bb index d520568d46..868f940e1d 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 \ file://includes.patch \ " SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \ - file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch" + " SRC_URI[md5sum] = "e200028702c831d5f535d20d61e608ef" SRC_URI[sha256sum] = "a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e" -- cgit v1.2.3-54-g00ecf