From patchwork Sun Jul 14 23:25:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1131814 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZukDoaXx"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45n2pK4S8Qz9sMQ for ; Mon, 15 Jul 2019 09:25:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 09CB38618E; Sun, 14 Jul 2019 23:25:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OMLbCIuaB+HL; Sun, 14 Jul 2019 23:25:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0A39B86130; Sun, 14 Jul 2019 23:25:42 +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 6F28F1BF3F9 for ; Sun, 14 Jul 2019 23:25:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6986F871DE for ; Sun, 14 Jul 2019 23:25:40 +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 Ac+hOt0oBGx8 for ; Sun, 14 Jul 2019 23:25:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 706D98715D for ; Sun, 14 Jul 2019 23:25:39 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id x1so126443wrr.9 for ; Sun, 14 Jul 2019 16:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hTg48tTNX/2V7osPfJGVNnrMVLxwRpz6sPcTFWmjlUU=; b=ZukDoaXx6TjN/EJFN5FIXs42xdKHS3PgN9aKl9M0qAcoP8Z+Tn1BRSlVgUoVw+uzeu +XjYeH09yCSyqNhKNQ/Rc3hv4zDmvsZrxKLQ8FtbtNkljBDecR+Wb1bnkrGL2k23VUzF RJIXtU4LiGE9XPKJtqvhBQbQxThqjzaT6QGPoOVioW6UhauM7eK/ssMxazQQvdsHns9y pzUmRgU/vZfY9cU3cyIFPvYuZfJOUd6bCbrPIQKehxaLr/cMIR3XgJ+jN1Jyt27Pstqx e3LplnjprJr7VyKs15LivLtgsxV/l6o1NiXKGZp6iL3EbRhWJD7pPCiuOtebm+N9oD0q V4zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hTg48tTNX/2V7osPfJGVNnrMVLxwRpz6sPcTFWmjlUU=; b=URs4urV0O7QCuWmI0DUhfmSBEfgbkxUrLA6s8Jojah20WsEZZ14d7uGCUztsq8mMZu 6pm9u6q7DBZqttSlvFGWEZL1Yv/qCYpMY3OjKQqJMw1AkB4VoZJj42L7Ez+4vZPoLmB6 nGFO6uX4Izzdv/FED4JqQY9u3cO7eR9a6tRh5APqeG8JnnDK9hKeNz1qVNxig1C2h+35 8v/VZ6c93+Pu/dFExrnaEfNZYcj0+gNHV8d8wfkz1hwM7cHKALgNFbXmpBJ5yEvmek5h q9G+J4glsMKp3a9KGbo/mFR2hkwkRYxy4ATnUQ3CoQdfjKRi4UZZjGhep+2iJCiPODH2 WqxQ== X-Gm-Message-State: APjAAAX3NPswEVM0nakOd2bN1lHROAY6S+NAaIuAT0+ARccPsGgTUdKN ROk0BBfGKSDGGBpqH37l8XainG+n X-Google-Smtp-Source: APXvYqye4H88PTNqfRpYWHgpbtHC9dYXTKr0lBSvOJC9WHL3gGD82OiyNNnjK+7+8450A3+MoXYWwg== X-Received: by 2002:adf:9ccf:: with SMTP id h15mr6970752wre.241.1563146737793; Sun, 14 Jul 2019 16:25:37 -0700 (PDT) Received: from kali.home (lfbn-ren-1-605-248.w81-53.abo.wanadoo.fr. [81.53.181.248]) by smtp.gmail.com with ESMTPSA id j33sm34626198wre.42.2019.07.14.16.25.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 14 Jul 2019 16:25:37 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 15 Jul 2019 01:25:45 +0200 Message-Id: <20190714232545.28892-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix build with kernel >= 5.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Marcin Bis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/1b965c5d9c782d6689041eeeb7be3be4a4854346 Signed-off-by: Fabrice Fontaine --- ...x-build-after-y2038-changes-in-glibc.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch diff --git a/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 0000000000..7d08c6aa40 --- /dev/null +++ b/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch @@ -0,0 +1,68 @@ +From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jun 2019 09:51:33 +0200 +Subject: tools: Fix build after y2038 changes in glibc + +The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name +to fix the build. +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/tools/?id=f36f71f60b1e68c0f12e615b9b128d089ec3dd19] +Signed-off-by: Fabrice Fontaine +--- + tools/l2test.c | 6 +++++- + tools/rctest.c | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +(limited to 'tools') + +diff --git a/tools/l2test.c b/tools/l2test.c +index e755ac881..e787c2ce2 100644 +--- a/tools/l2test.c ++++ b/tools/l2test.c +@@ -55,6 +55,10 @@ + #define BREDR_DEFAULT_PSM 0x1011 + #define LE_DEFAULT_PSM 0x0080 + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -907,7 +911,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +diff --git a/tools/rctest.c b/tools/rctest.c +index 94490f462..bc8ed875d 100644 +--- a/tools/rctest.c ++++ b/tools/rctest.c +@@ -50,6 +50,10 @@ + + #include "src/shared/util.h" + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -505,7 +509,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +-- +cgit 1.2-0.3.lf.el7 +