0001-test-gatt-Fix-hung-issue.patch was added to solve a problem with the test case, but the test passes without it and upstream don't agree that this is fixing the test case[1].
[1] https://marc.info/?l=linux-bluetooth&m=153509658106588&w=2 Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 - .../0001-test-gatt-Fix-hung-issue.patch | 43 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index f582a07e22a..ced44b474bc 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -53,7 +53,6 @@ SRC_URI = "\ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ - file://0001-test-gatt-Fix-hung-issue.patch \ file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \ file://CVE-2018-10910.patch \ file://gcc9-fixes.patch \ diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch deleted file mode 100644 index e90b6a546fd..00000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 61e741654cc2eb167bca212a3bb2ba8f3ba280c1 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <[email protected]> -Date: Fri, 24 Aug 2018 12:04:03 +0800 -Subject: [PATCH] test-gatt: Fix hung issue - -The below test hangs infinitely -$ unit/test-gatt -p /robustness/unkown-request -d -/robustness/unkown-request - init -/robustness/unkown-request - setup -/robustness/unkown-request - setup complete -/robustness/unkown-request - run - GATT: < 02 17 00 ... - bt_gatt_server:MTU exchange complete, with MTU: 23 - GATT: > 03 00 02 ... - PDU: = 03 00 02 ... - GATT: < bf 00 - -Actually, the /robustness/unkown-request test does -no action. - -Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=153508881804635&w=2] - -Signed-off-by: Mingli Yu <[email protected]> ---- - unit/test-gatt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unit/test-gatt.c b/unit/test-gatt.c -index c7e28f8..b57373b 100644 ---- a/unit/test-gatt.c -+++ b/unit/test-gatt.c -@@ -4463,7 +4463,7 @@ int main(int argc, char *argv[]) - test_server, service_db_1, NULL, - raw_pdu(0x03, 0x00, 0x02), - raw_pdu(0xbf, 0x00), -- raw_pdu(0x01, 0xbf, 0x00, 0x00, 0x06)); -+ raw_pdu()); - - define_test_server("/robustness/unkown-command", - test_server, service_db_1, NULL, --- -2.7.4 - -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
