From 454426961cf43c8ab0cf13b8fe83e498b1de424a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 3 Jun 2024 22:00:25 +0200 Subject: [PATCH] package/esp-hosted: fix build failure on Linux 6.8.12+ Add local patch pending upstream to fix build failure due to old Linux Bluetooth API. Fixes: http://autobuild.buildroot.net/results/d64fa083ec27c3684d4186d2b1b05e041ad330f5/ http://autobuild.buildroot.net/results/5c4fac191970444e63109a762023c0e60f9693e2/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...x-Bluetooth-build-failure-on-Linux-6.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch diff --git a/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch b/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch new file mode 100644 index 0000000000..c701aaa82f --- /dev/null +++ b/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch @@ -0,0 +1,37 @@ +From f8903bc2be7ae5ac9fb9bbeed8512e974c6e60ec Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 3 Jun 2024 21:53:38 +0200 +Subject: [PATCH] esp_hosted_ng: Fix Bluetooth build failure on Linux 6.8.11+ + +After Linux commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=84a4bb6548a29326564f0e659fb8064503ecc1c7 +BT_HS has been removed and consequently AMP controllers can't be created, +so at this point only HCI_PRIMARY has been left as unique controller type +to be created and this became implicit with no need to define if the +controller if HCI_PRIMARY or HCI_AMP. So let's assign HCI_PRIMARY up to +Linux 6.8.11 only preventing build failure. + +Upstream: https://github.com/espressif/esp-hosted/pull/400 + +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/esp_bt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/esp_hosted_ng/host/esp_bt.c b/esp_hosted_ng/host/esp_bt.c +index 3b78c11698..4598ac0e0a 100644 +--- a/esp_hosted_ng/host/esp_bt.c ++++ b/esp_hosted_ng/host/esp_bt.c +@@ -240,7 +240,9 @@ int esp_init_bt(struct esp_adapter *adapter) + hdev->set_bdaddr = esp_bt_set_bdaddr; + #endif + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(6, 8, 11)) + hdev->dev_type = HCI_PRIMARY; ++#endif + + SET_HCIDEV_DEV(hdev, adapter->dev); + +-- +2.34.1 +