summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2023-07-03 11:30:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-10 11:36:34 +0100
commit863477938dffee130c94850a0d61e8d47f0d53ec (patch)
tree15fedbc7956bac3e50eb1dbb544b96df21caf258 /meta/recipes-connectivity/bluez5
parenteb4c1c393ff4ed55e177a5e38d49d7499c8aefa1 (diff)
downloadpoky-863477938dffee130c94850a0d61e8d47f0d53ec.tar.gz
bluez5: upgrade 5.66 -> 5.68
Include a patch submitted upstream to fix cross-compilation issues. (From OE-Core rev: 1067c44ee48b2e72624c42c8e1675307bd73900e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch39
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.68.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.66.bb)2
3 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index e10158a6e5..d2ee2b4f12 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -55,6 +55,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
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 file://0004-src-shared-util.c-include-linux-limits.h.patch \
58 file://fix-check-ell-path.patch \
58 " 59 "
59S = "${WORKDIR}/bluez-${PV}" 60S = "${WORKDIR}/bluez-${PV}"
60 61
diff --git a/meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch b/meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch
new file mode 100644
index 0000000000..7afa63962d
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=168818474411163&w=2]
2Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
3
4From linux-bluetooth Sat Jul 01 04:12:52 2023
5From: Rudi Heitbaum <rudi () heitbaum ! com>
6Date: Sat, 01 Jul 2023 04:12:52 +0000
7To: linux-bluetooth
8Subject: [PATCH] configure: Fix check ell path for cross compiling
9Message-Id: <20230701041252.139338-1-rudi () heitbaum ! com>
10X-MARC-Message: https://marc.info/?l=linux-bluetooth&m=168818474411163
11
12Use of AC_CHECK_FILE prevents cross compilation.
13Instead use test to support cross compiling.
14
15Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
16---
17 configure.ac | 7 ++++---
18 1 file changed, 4 insertions(+), 3 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index eff297960..bc7edfcd3 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then
25 AC_SUBST(ELL_LIBS)
26 fi
27 if (test "${enable_external_ell}" != "yes"); then
28- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes,
29- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes,
30- AC_MSG_ERROR(ELL source is required or use --enable-external-ell)))
31+ if (test ! -f ${srcdir}/ell/ell.h) &&
32+ (test ! -f ${srcdir}/../ell/ell/ell.h); then
33+ AC_MSG_ERROR(ELL source is required or use --enable-external-ell)
34+ fi
35 fi
36 AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" ||
37 (test "${enable_btpclient}" != "yes" &&
38--
392.34.1
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.66.bb b/meta/recipes-connectivity/bluez5/bluez5_5.68.bb
index 2208b730b0..921f739fb8 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.66.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.68.bb
@@ -1,6 +1,6 @@
1require bluez5.inc 1require bluez5.inc
2 2
3SRC_URI[sha256sum] = "39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574" 3SRC_URI[sha256sum] = "fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933"
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
6CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490" 6CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490"