4 files changed, 4 insertions, 46 deletions

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 48aeff0aee..24a41f92df 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -54,7 +54,6 @@ PACKAGECONFIG[csip-profiles] = "--enable-csip,--disable-csip"
 PACKAGECONFIG[asha-profiles] = "--enable-asha,--disable-asha"
 PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis"
 PACKAGECONFIG[tools] = "--enable-tools,--disable-tools"
-PACKAGECONFIG[threads] = "--enable-threads,--disable-threads"
 PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated"
 PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh, json-c ell"
 PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient, ell"
@@ -65,7 +64,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://init \
            file://run-ptest \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
-           file://0001-bluez5-disable-aics-tests.patch \
            "
 S = "${UNPACKDIR}/bluez-${PV}"
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-bluez5-disable-aics-tests.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-bluez5-disable-aics-tests.patch
deleted file mode 100644
index 3f01843ea3..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5/0001-bluez5-disable-aics-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 182545f2504255d67d9ec2071fd5c82ab53c5a2e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g@gmail.com>
-Date: Sun, 30 Mar 2025 02:20:24 +0000
-Subject: [PATCH] bluez5: disable aics tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Temporarily disable aics tests as they can fail
-depending on how the tests are executed. Sometimes they pass,
-sometimes they fail. The issue has been observed since BlueZ 5.72 to 5.80
-
-Starting with BlueZ 5.80, the tests began failing when using the
-ptest-runner script. This is not a new issue in BlueZ 5.80 which is
-why the test is disabled with this commit until a solution is found.
-
-See discussion on Github:
-https://github.com/bluez/bluez/issues/726
-https://github.com/bluez/bluez/issues/683
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
----
- unit/test-vcp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unit/test-vcp.c b/unit/test-vcp.c
-index 6a61ea2..04b92e4 100644
---- a/unit/test-vcp.c
-+++ b/unit/test-vcp.c
-@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[])
-        tester_init(&argc, &argv);
- 
-        test_vocs_unit_testcases();
--       test_aics_unit_testcases();
-+       //test_aics_unit_testcases();
- 
-        return tester_run();
- }
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
index a9af56f141..cea7c10c3d 100644
--- a/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
+++ b/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
@@ -1,4 +1,4 @@
-From fa5da30786837b437707cea921056e9c1c22ffba Mon Sep 17 00:00:00 2001
+From d8bbdd8e7166f481429b4999f520cd8306685f03 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 1 Apr 2016 17:07:34 +0300
 Subject: [PATCH] tests: add a target for building tests without running them
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/Makefile.am b/Makefile.am
-index 02ad23c..169269d 100644
+index 94f625d..a3c3512 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -722,6 +722,9 @@ endif
+@@ -725,6 +725,9 @@ endif
  TESTS = $(unit_tests)
  AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69
  
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.83.bb b/meta/recipes-connectivity/bluez5/bluez5_5.84.bb
index 8af6bdb67e..874db9df64 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.83.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.84.bb
@@ -1,6 +1,6 @@
 require bluez5.inc
 
-SRC_URI[sha256sum] = "108522d909d220581399bfec93daab62035539ceef3dda3e79970785c63bd24c"
+SRC_URI[sha256sum] = "5ba73d030f7b00087d67800b0e321601aec0f892827c72e5a2c8390d8c886b11"
 
 CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes"