diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2023-07-03 11:30:25 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:06 +0100 |
| commit | 1067c44ee48b2e72624c42c8e1675307bd73900e (patch) | |
| tree | b0acb8a9e7ff14a4283ce130fae6d863915228d9 /meta/recipes-connectivity/bluez5 | |
| parent | 180bc03993b4d6a43d29e98ac678ee508df43b48 (diff) | |
| download | openembedded-core-1067c44ee48b2e72624c42c8e1675307bd73900e.tar.gz | |
bluez5: upgrade 5.66 -> 5.68
Include a patch submitted upstream to fix cross-compilation issues.
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.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch | 39 | ||||
| -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 \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0004-src-shared-util.c-include-linux-limits.h.patch \ + file://fix-check-ell-path.patch \ " S = "${WORKDIR}/bluez-${PV}" 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 @@ +Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=168818474411163&w=2] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +From linux-bluetooth Sat Jul 01 04:12:52 2023 +From: Rudi Heitbaum <rudi () heitbaum ! com> +Date: Sat, 01 Jul 2023 04:12:52 +0000 +To: linux-bluetooth +Subject: [PATCH] configure: Fix check ell path for cross compiling +Message-Id: <20230701041252.139338-1-rudi () heitbaum ! com> +X-MARC-Message: https://marc.info/?l=linux-bluetooth&m=168818474411163 + +Use of AC_CHECK_FILE prevents cross compilation. +Instead use test to support cross compiling. + +Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> +--- + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index eff297960..bc7edfcd3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then + AC_SUBST(ELL_LIBS) + fi + if (test "${enable_external_ell}" != "yes"); then +- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, +- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, +- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) ++ if (test ! -f ${srcdir}/ell/ell.h) && ++ (test ! -f ${srcdir}/../ell/ell/ell.h); then ++ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) ++ fi + fi + AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || + (test "${enable_btpclient}" != "yes" && +-- +2.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 @@ require bluez5.inc -SRC_URI[sha256sum] = "39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574" +SRC_URI[sha256sum] = "fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490" |