summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-08-28 15:28:37 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:23 +0100
commitb4731a1202cfa45c7e1f635552398b89a37f2eeb (patch)
tree7f9b4bb6a8c4aaa3b79b13ce36aea37a19879491 /meta/recipes-connectivity
parente97c529bfa4e1d0038ea44f15ee3298003daf981 (diff)
downloadopenembedded-core-b4731a1202cfa45c7e1f635552398b89a37f2eeb.tar.gz
openembedded-core-b4731a1202cfa45c7e1f635552398b89a37f2eeb.tar.bz2
openembedded-core-b4731a1202cfa45c7e1f635552398b89a37f2eeb.zip
bluez5: fix build against libc-headers 5.2+
Backporting the following upstream commit to fix the build against kernel 5.2+ headers: [ Subject: [PATCH] tools: Fix build after y2038 changes in glibc The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build. ] Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch68
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index bffd174c0a..6c79ed0606 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -57,6 +57,7 @@ SRC_URI = "\
file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
file://CVE-2018-10910.patch \
file://gcc9-fixes.patch \
+ file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \
"
S = "${WORKDIR}/bluez-${PV}"
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
new file mode 100644
index 0000000000..9ca20ae53b
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/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 <hadess@hadess.net>
+Date: Fri, 7 Jun 2019 09:51:33 +0200
+Subject: [PATCH] tools: Fix build after y2038 changes in glibc
+
+The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name
+to fix the build.
+
+Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+
+---
+ tools/l2test.c | 6 +++++-
+ tools/rctest.c | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+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 {
+--
+2.19.1
+