From patchwork Wed Mar 14 21:58:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 886053 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 401lwc2VsWz9rxp for ; Thu, 15 Mar 2018 08:58:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B7B2887E39; Wed, 14 Mar 2018 21:58:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MUyqf2ETmJMS; Wed, 14 Mar 2018 21:58:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0923A87E41; Wed, 14 Mar 2018 21:58:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 24C621C1F91 for ; Wed, 14 Mar 2018 21:58:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 21C5F89EAB for ; Wed, 14 Mar 2018 21:58:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PU-Myq7zb5jY for ; Wed, 14 Mar 2018 21:58:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by hemlock.osuosl.org (Postfix) with ESMTPS id ACCE189E6C for ; Wed, 14 Mar 2018 21:58:35 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E8CA72122F for ; Wed, 14 Mar 2018 22:58:32 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 401lwR6sTlz9rxM; Wed, 14 Mar 2018 22:58:31 +0100 (CET) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id T9s_8hF_yGzb; Wed, 14 Mar 2018 22:58:30 +0100 (CET) Received: from nzxt.fritz.box (port-92-195-29-234.dynamic.qsc.de [92.195.29.234]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 14 Mar 2018 22:58:30 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Wed, 14 Mar 2018 22:58:28 +0100 Message-Id: <20180314215828.18789-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.16.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] bluez5_utils: bump to version 5.49 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Marcin Bis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- ...est.c-Remove-include-linux-if_bridge.h-to.patch | 45 ---------------------- package/bluez5_utils/bluez5_utils.hash | 4 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch 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 -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 -(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 - #include - #include --#include -+/* #include -+ * breaks on musl: we already included netinet/in.h, -+ * if we also include 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 */ -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 - - #include - --- -2.8.1 - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index dc331b5a0d..8d142b755c 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90 bluez-5.48.tar.xz +sha256 33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95 bluez-5.49.tar.xz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 395340a3e6..e1c67bd622 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ5_UTILS_VERSION = 5.48 +BLUEZ5_UTILS_VERSION = 5.49 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES