diff options
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5_5.66.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.65.bb) | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 976297127d..e10158a6e5 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
| @@ -54,6 +54,7 @@ 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 \ | ||
| 57 | " | 58 | " |
| 58 | S = "${WORKDIR}/bluez-${PV}" | 59 | S = "${WORKDIR}/bluez-${PV}" |
| 59 | 60 | ||
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 new file mode 100644 index 0000000000..f954f6dab2 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 51584158b9a2e58f3790f8a7387b5cf167eca88b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Mon, 12 Dec 2022 13:10:19 +0100 | ||
| 4 | Subject: [PATCH] src/shared/util.c: include linux/limits.h | ||
| 5 | |||
| 6 | MAX_INPUT is defined in that file. This matters on non-glibc | ||
| 7 | systems such as those using musl. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [to linux-bluetooth@vger.kernel.org,luiz.von.dentz@intel.com,frederic.danis@collabora.com] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 11 | --- | ||
| 12 | src/shared/util.c | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/src/shared/util.c b/src/shared/util.c | ||
| 16 | index 0a0308c..1f61314 100644 | ||
| 17 | --- a/src/shared/util.c | ||
| 18 | +++ b/src/shared/util.c | ||
| 19 | @@ -22,6 +22,7 @@ | ||
| 20 | #include <unistd.h> | ||
| 21 | #include <dirent.h> | ||
| 22 | #include <limits.h> | ||
| 23 | +#include <linux/limits.h> | ||
| 24 | #include <string.h> | ||
| 25 | |||
| 26 | #ifdef HAVE_SYS_RANDOM_H | ||
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.65.bb b/meta/recipes-connectivity/bluez5/bluez5_5.66.bb index 4c15aeb46d..2208b730b0 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.65.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.66.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require bluez5.inc | 1 | require bluez5.inc |
| 2 | 2 | ||
| 3 | SRC_URI[sha256sum] = "2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4" | 3 | SRC_URI[sha256sum] = "39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574" |
| 4 | 4 | ||
| 5 | # These issues have kernel fixes rather than bluez fixes so exclude here | 5 | # These issues have kernel fixes rather than bluez fixes so exclude here |
| 6 | CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490" | 6 | CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490" |
