summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuðni Már Gilbert <gudni.m.g@gmail.com>2024-09-17 19:34:46 +0000
committerSteve Sakoman <steve@sakoman.com>2024-09-25 05:07:47 -0700
commitcd4eeb1fb69a27e67e699aa6c7ffd8f9866243e3 (patch)
treeb80ee6d3eea3e80cea3cc01222db0c62c0eee02b
parentd29097d143417b00fc52c1e6659cd957690651ec (diff)
downloadpoky-cd4eeb1fb69a27e67e699aa6c7ffd8f9866243e3.tar.gz
bluez5: remove redundant patch for MAX_INPUT
The solution to the problem upstream was fixed by the following commit: https://github.com/bluez/bluez/commit/ca6546fe521360fcf905bc115b893f322e706cb2 Now MAX_INPUT is defined for non-glibc systems such as musl. This fix was added in BlueZ 5.67. (From OE-Core rev: a2532944258334c9f64b673278040dd5e27489d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch27
2 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index a31d7076ba..3f2f096aac 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -54,7 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
54 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ 54 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
55 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ 55 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
56 file://0001-test-gatt-Fix-hung-issue.patch \ 56 file://0001-test-gatt-Fix-hung-issue.patch \
57 file://0004-src-shared-util.c-include-linux-limits.h.patch \
58 " 57 "
59S = "${WORKDIR}/bluez-${PV}" 58S = "${WORKDIR}/bluez-${PV}"
60 59
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch b/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch
deleted file mode 100644
index 516d859069..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From b53df61b41088b68c127ac76cc71683ac3453b9d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 12 Dec 2022 13:10:19 +0100
4Subject: [PATCH] src/shared/util.c: include linux/limits.h
5
6MAX_INPUT is defined in that file. This matters on non-glibc
7systems such as those using musl.
8
9Upstream-Status: Submitted [to linux-bluetooth@vger.kernel.org,luiz.von.dentz@intel.com,frederic.danis@collabora.com]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11
12---
13 src/shared/util.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/shared/util.c b/src/shared/util.c
17index c0c2c4a..036dc0d 100644
18--- a/src/shared/util.c
19+++ b/src/shared/util.c
20@@ -23,6 +23,7 @@
21 #include <unistd.h>
22 #include <dirent.h>
23 #include <limits.h>
24+#include <linux/limits.h>
25 #include <string.h>
26
27 #ifdef HAVE_SYS_RANDOM_H