diff options
Diffstat (limited to 'meta/recipes-connectivity')
| -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.69.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.68.bb) | 2 |
3 files changed, 1 insertions, 41 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index d2ee2b4f12..e10158a6e5 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -55,7 +55,6 @@ 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 deleted file mode 100644 index 7afa63962d..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/fix-check-ell-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -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.68.bb b/meta/recipes-connectivity/bluez5/bluez5_5.69.bb index 7c7ad75ed8..4673000f60 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.68.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.69.bb @@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933" +SRC_URI[sha256sum] = "bc5a35ddc7c72d0d3999a0d7b2175c8b7d57ab670774f8b5b4900ff38a2627fc" CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes" |