summaryrefslogtreecommitdiffstats
path: root/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch
diff options
context:
space:
mode:
authorJörg Krause <joerg.krause@embedded.rocks>2018-03-14 22:58:28 +0100
committerPeter Korsgaard <peter@korsgaard.com>2018-03-16 10:35:16 +0100
commitfaf31a87f4dc4c03785ee55fb92818bd59cf5dbb (patch)
treede0dd8c196b7c7bf9a2d00a030789b76e9d5ecd9 /package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch
parentb67b65b3bab01f8dc3b06a3af69bdc8537b55ed8 (diff)
downloadbuildroot-faf31a87f4dc4c03785ee55fb92818bd59cf5dbb.tar.gz
buildroot-faf31a87f4dc4c03785ee55fb92818bd59cf5dbb.zip
bluez5_utils: bump to version 5.49
Drop musl patch, which is not necessary anymore as netinet vs linux header clash is fixed. Also add hash for the license files. musl build successfully tested with: * armv7-eabihf--musl--stable-2017.05-toolchains-1-1 (GCC 5.4.0, Linux headers 3.10.105, musl 1.1.16) * armv7-eabihf--musl--bleeding-edge-2018.02-1 (GCC 7.3.0, Linux headers 4.9.80, musl 1.1.18) Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch')
-rw-r--r--package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch b/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch
deleted file mode 100644
index e8a3ff47bf..0000000000
--- a/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7c136b4f1941e5bb2a6c8d93985c5734c6aefb29 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@writeme.com>
-Date: Sun, 22 May 2016 09:48:57 +0200
-Subject: [PATCH 1/1] tools/bneptest.c: Remove include linux/if_bridge.h to fix
- musl build
-
-Inspired by busybox commit:
-https://git.busybox.net/busybox/commit/networking/brctl.c?id=5fa6d1a632505789409a2ba6cf8e112529f9db18
-
-The build error was found by the autobuilders of the buildroot project:
-http://autobuild.buildroot.net/results/eba/ebaa0bcb9c325aa6ed0bbd6c7ec75d44befa7645/build-end.log
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@writeme.com>
-(Patch sent upstream:
- http://article.gmane.org/gmane.linux.bluez.kernel/67621)
----
- tools/bneptest.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/tools/bneptest.c b/tools/bneptest.c
-index 1404252..b832d72 100644
---- a/tools/bneptest.c
-+++ b/tools/bneptest.c
-@@ -36,7 +36,17 @@
- #include <net/if.h>
- #include <linux/sockios.h>
- #include <netinet/in.h>
--#include <linux/if_bridge.h>
-+/* #include <linux/if_bridge.h>
-+ * breaks on musl: we already included netinet/in.h,
-+ * if we also include <linux/if_bridge.h> here, we get this:
-+ * In file included from /usr/include/linux/if_bridge.h:18,
-+ * from networking/brctl.c:67:
-+ * /usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr'
-+ * /usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6'
-+ * /usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq'
-+ */
-+/* From <linux/if_bridge.h> */
-+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
-
- #include <glib.h>
-
---
-2.8.1
-
OpenPOWER on IntegriCloud