From 770096010500341fe80d6efd6d53c4a922b79c31 Mon Sep 17 00:00:00 2001 From: Li Ping <1477412247@qq.com> Date: Tue, 15 Jul 2025 20:11:57 +0800 Subject: [PATCH] btusb: move btmtk module from extra to main kernel modules The btusb.ko module has dependencies on symbols provided by btmtk.ko, but btmtk.ko was incorrectly placed in the kernel-extra-modules package. This caused depmod warnings during kernel installation since the required symbols (btmtk_setup_firmware*, btmtk_set_bdaddr, etc.) were unavailable when btusb was loaded. Fix this by moving btmtk.ko from extra-modules_x86_64.list to be included in the standard kernel modules package where btusb can access its symbols. --- extra-modules_x86_64.list | 1 - kernel.spec | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/extra-modules_x86_64.list b/extra-modules_x86_64.list index 7764c18..7151bfe 100644 --- a/extra-modules_x86_64.list +++ b/extra-modules_x86_64.list @@ -1,4 +1,3 @@ -drivers/bluetooth/btmtk.ko drivers/hid/i2c-hid/i2c-hid-acpi.ko drivers/hid/i2c-hid/i2c-hid.ko drivers/net/wireless/marvell/mwl8k.ko diff --git a/kernel.spec b/kernel.spec index ec9cf71..abd6e10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 100 %global maintenance_release .0.0 -%global pkg_release .105 +%global pkg_release .106 %global openeuler_lts 1 %global openeuler_major 2403 @@ -1138,6 +1138,13 @@ fi %endif %changelog +* Wed Jul 16 2025 Li Ping <1477412247@qq.com> - 6.6.0-100.0.0.106 +- btusb: move btmtk module from extra to main kernel modules + * Fixes dependency issue where btusb.ko required symbols from btmtk.ko + (btmtk_setup_firmware*, btmtk_set_bdaddr, etc.) + * Resolves depmod warnings during kernel installation + * Original issue seen with kernel-6.6.0-100.0.0.105.oe2403sp2.x86_64 + * Wed Jul 09 2025 Li Nan - 6.6.0-100.0.0.105 - !17003 net_sched: red: fix a race in __red_change() - !16747 LoongArch: Fix bugs in huge_pte_offset/__alloc_pages_slowpath/iommu -- Gitee