diff options
| -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 \ | |||
| 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 \ | ||
| 59 | " | 58 | " |
| 60 | S = "${WORKDIR}/bluez-${PV}" | 59 | S = "${WORKDIR}/bluez-${PV}" |
| 61 | 60 | ||
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 @@ | |||
| 1 | Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=168818474411163&w=2] | ||
| 2 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 3 | |||
| 4 | From linux-bluetooth Sat Jul 01 04:12:52 2023 | ||
| 5 | From: Rudi Heitbaum <rudi () heitbaum ! com> | ||
| 6 | Date: Sat, 01 Jul 2023 04:12:52 +0000 | ||
| 7 | To: linux-bluetooth | ||
| 8 | Subject: [PATCH] configure: Fix check ell path for cross compiling | ||
| 9 | Message-Id: <20230701041252.139338-1-rudi () heitbaum ! com> | ||
| 10 | X-MARC-Message: https://marc.info/?l=linux-bluetooth&m=168818474411163 | ||
| 11 | |||
| 12 | Use of AC_CHECK_FILE prevents cross compilation. | ||
| 13 | Instead use test to support cross compiling. | ||
| 14 | |||
| 15 | Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 16 | --- | ||
| 17 | configure.ac | 7 ++++--- | ||
| 18 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/configure.ac b/configure.ac | ||
| 21 | index 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 | -- | ||
| 39 | 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 @@ | |||
| 1 | require bluez5.inc | 1 | require bluez5.inc |
| 2 | 2 | ||
| 3 | SRC_URI[sha256sum] = "fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933" | 3 | SRC_URI[sha256sum] = "bc5a35ddc7c72d0d3999a0d7b2175c8b7d57ab670774f8b5b4900ff38a2627fc" |
| 4 | 4 | ||
| 5 | CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes" | 5 | CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes" |
| 6 | 6 | ||
